AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-26 14:54:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

The /texture command should show you a warning if url is > 64 characters, also should show 'help' when an invalid scope is specified.

Browse Source
This commit is contained in:
UnknownShadow200 2016-04-07 12:51:34 +10:00
parent dfd65bbd77
commit c03e09b853
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Commands/World/CmdTexture.cs
View File

@ -30,19 +30,21 @@ namespace MCGalaxy.Commands {
if (message == "") { Help(p); return; } if (message == "") { Help(p); return; }
string[] args = message.Split(' '); string[] args = message.Split(' ');
string scope = args[0].ToLower(); string scope = args[0].ToLower();
if (scope == "local") scope = "level";
if (scope == "localzip") scope = "levelzip";
if (args.Length == 1) { if (args.Length == 1) {
if (scope == "level") if (scope == "level")
Player.SendMessage(p, "Level terrain: " + GetPath(p.level.terrainUrl)); Player.SendMessage(p, "Level terrain: " + GetPath(p.level.terrainUrl));
else if (scope == "levelzip") else if (scope == "levelzip")
Player.SendMessage(p, "Level tex pack: " + GetPath(p.level.texturePackUrl)); Player.SendMessage(p, "Level tex pack: " + GetPath(p.level.texturePackUrl));
else if (scope == "global") else if (scope == "global")
Player.SendMessage(p, "Global terrain: " + GetPath(Server.defaultTerrainUrl)); Player.SendMessage(p, "Global terrain: " + GetPath(Server.defaultTerrainUrl));
else if (scope == "globalzip") else if (scope == "globalzip")
Player.SendMessage(p, "Global tex pack: " + GetPath(Server.defaultTexturePackUrl)); Player.SendMessage(p, "Global tex pack: " + GetPath(Server.defaultTexturePackUrl));
else else
Help(p); Help(p);
return; return;
} }
string url = args[1]; string url = args[1];
@ -58,6 +60,7 @@ namespace MCGalaxy.Commands {
if ((scope == "globalzip" || scope == "levelzip") && !(url == "" || url.EndsWith(".zip"))) { if ((scope == "globalzip" || scope == "levelzip") && !(url == "" || url.EndsWith(".zip"))) {
p.SendMessage("The texture pack URL must end in a .zip"); return; p.SendMessage("The texture pack URL must end in a .zip"); return;
} }
if (url.Length > 64) { p.SendMessage("The URL must be 64 characters or less."); return; }
if (scope == "global") { if (scope == "global") {
Server.defaultTerrainUrl = url; Server.defaultTerrainUrl = url;
@ -75,15 +78,15 @@ namespace MCGalaxy.Commands {
p.level.texturePackUrl = url; p.level.texturePackUrl = url;
p.SendMessage("Set level's texture pack to " + args[1]); p.SendMessage("Set level's texture pack to " + args[1]);
UpdateLevel(p, true); UpdateLevel(p, true);
} else {
Help(p);
} }
} }
static string GetPath(string url) { static string GetPath(string url) { return url == "" ? "(none)" : url; }
return url == "" ? "(none)" : url;
}
void UpdateGlobally(Player p, bool zip) { void UpdateGlobally(Player p, bool zip) {
Player[] players = PlayerInfo.Online.Items; Player[] players = PlayerInfo.Online.Items;
foreach (Player pl in players) { foreach (Player pl in players) {
bool hasExt = pl.HasCpeExt(CpeExt.EnvMapAppearance) || pl.HasCpeExt(CpeExt.EnvMapAppearance, 2); bool hasExt = pl.HasCpeExt(CpeExt.EnvMapAppearance) || pl.HasCpeExt(CpeExt.EnvMapAppearance, 2);
string url = zip ? pl.level.texturePackUrl : pl.level.terrainUrl; string url = zip ? pl.level.texturePackUrl : pl.level.terrainUrl;
@ -94,7 +97,7 @@ namespace MCGalaxy.Commands {
} }
void UpdateLevel(Player p, bool zip) { void UpdateLevel(Player p, bool zip) {
Player[] players = PlayerInfo.Online.Items; Player[] players = PlayerInfo.Online.Items;
foreach (Player pl in players) { foreach (Player pl in players) {
bool hasExt = pl.HasCpeExt(CpeExt.EnvMapAppearance) || pl.HasCpeExt(CpeExt.EnvMapAppearance, 2); bool hasExt = pl.HasCpeExt(CpeExt.EnvMapAppearance) || pl.HasCpeExt(CpeExt.EnvMapAppearance, 2);
if (hasExt && pl.level == p.level) if (hasExt && pl.level == p.level)