AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-24 05:03:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make /map work with unloaded maps.

Browse Source
This commit is contained in:
UnknownShadow200 2017-06-27 22:24:30 +10:00
parent b05a20981c
commit 80ea964409
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
MCGalaxy/Commands/World/CmdMap.cs
View File

@ -40,15 +40,21 @@ namespace MCGalaxy.Commands.World {
string opt = null, value = null; string opt = null, value = null;
if (IsMapOption(args)) { if (IsMapOption(args)) {
if (Player.IsSuper(p)) { SuperRequiresArgs(p, "level"); return; } if (Player.IsSuper(p)) { SuperRequiresArgs(p, "level"); return; }
lvl = p.level;
lvl = p.level; opt = args[0]; opt = args[0];
args = message.SplitSpaces(2); args = message.SplitSpaces(2);
value = args.Length > 1 ? args[1] : ""; value = args.Length > 1 ? args[1] : "";
} else if (args.Length == 1) {
string map = Matcher.FindMaps(p, args[0]);
if (map == null) return;
PrintMapInfo(p, GetConfig(map));
return;
} else { } else {
lvl = Matcher.FindLevels(p, args[0]); lvl = Matcher.FindLevels(p, args[0]);
if (lvl == null) return; if (lvl == null) return;
if (args.Length == 1) { PrintMapInfo(p, lvl); return; }
opt = args[1]; opt = args[1];
value = args.Length > 2 ? args[2] : ""; value = args.Length > 2 ? args[2] : "";
@ -63,6 +69,16 @@ namespace MCGalaxy.Commands.World {
Player.Message(p, "Could not find option entered."); Player.Message(p, "Could not find option entered.");
} }
static LevelConfig GetConfig(string map) {
Level lvl = LevelInfo.FindExact(map);
if (lvl != null) return lvl.Config;
string propsPath = LevelInfo.FindPropertiesFile(map);
LevelConfig cfg = new LevelConfig();
if (propsPath != null) LevelConfig.Load(propsPath, cfg);
return cfg;
}
static bool IsMapOption(string[] args) { static bool IsMapOption(string[] args) {
string opt = LevelOptions.Map(args[0].ToLower()); string opt = LevelOptions.Map(args[0].ToLower());
if (!ValidOption(opt)) return false; if (!ValidOption(opt)) return false;
@ -98,32 +114,32 @@ namespace MCGalaxy.Commands.World {
|| opt == "fall" || opt == "drown" || opt == "realmowner" || opt == "loaddelay"; || opt == "fall" || opt == "drown" || opt == "realmowner" || opt == "loaddelay";
} }
static void PrintMapInfo(Player p, Level lvl) { static void PrintMapInfo(Player p, LevelConfig cfg) {
Player.Message(p, "%TPhysics settings:"); Player.Message(p, "%TPhysics settings:");
Player.Message(p, " Finite mode: {0}%S, Random flow: {1}", Player.Message(p, " Finite mode: {0}%S, Random flow: {1}",
GetBool(lvl.Config.FiniteLiquids), GetBool(lvl.Config.RandomFlow)); GetBool(cfg.FiniteLiquids), GetBool(cfg.RandomFlow));
Player.Message(p, " Animal hunt AI: {0}%S, Edge water: {1}", Player.Message(p, " Animal hunt AI: {0}%S, Edge water: {1}",
GetBool(lvl.Config.AnimalHuntAI), GetBool(lvl.Config.EdgeWater)); GetBool(cfg.AnimalHuntAI), GetBool(cfg.EdgeWater));
Player.Message(p, " Grass growing: {0}%S, {1} tree growing: {2}", Player.Message(p, " Grass growing: {0}%S, {1} tree growing: {2}",
GetBool(lvl.Config.GrassGrow), lvl.Config.TreeType.Capitalize(), GetBool(lvl.Config.GrowTrees)); GetBool(cfg.GrassGrow), cfg.TreeType.Capitalize(), GetBool(cfg.GrowTrees));
Player.Message(p, " Leaf decay: {0}%S, Physics overload: {1}", Player.Message(p, " Leaf decay: {0}%S, Physics overload: {1}",
GetBool(lvl.Config.LeafDecay), lvl.Config.PhysicsOverload); GetBool(cfg.LeafDecay), cfg.PhysicsOverload);
Player.Message(p, " Physics speed: &b{0} %Smilliseconds between ticks", Player.Message(p, " Physics speed: &b{0} %Smilliseconds between ticks",
lvl.Config.PhysicsSpeed); cfg.PhysicsSpeed);
Player.Message(p, "%TSurvival settings:"); Player.Message(p, "%TSurvival settings:");
Player.Message(p, " Survival death: {0} %S(Fall: {1}, Drown: {2})", Player.Message(p, " Survival death: {0} %S(Fall: {1}, Drown: {2})",
GetBool(lvl.Config.SurvivalDeath), lvl.Config.FallHeight, lvl.Config.DrownTime); GetBool(cfg.SurvivalDeath), cfg.FallHeight, cfg.DrownTime);
Player.Message(p, " Guns: {0}%S, Killer blocks: {1}", Player.Message(p, " Guns: {0}%S, Killer blocks: {1}",
GetBool(lvl.Config.Guns), GetBool(lvl.Config.KillerBlocks)); GetBool(cfg.Guns), GetBool(cfg.KillerBlocks));
Player.Message(p, "%TGeneral settings:"); Player.Message(p, "%TGeneral settings:");
Player.Message(p, " MOTD: &b" + lvl.Config.MOTD); Player.Message(p, " MOTD: &b" + cfg.MOTD);
Player.Message(p, " Roleplay (level only) chat: " + GetBool(!lvl.Config.ServerWideChat)); Player.Message(p, " Roleplay (level only) chat: " + GetBool(!cfg.ServerWideChat));
Player.Message(p, " Load on /goto: {0}%S, Auto unload: {1}", Player.Message(p, " Load on /goto: {0}%S, Auto unload: {1}",
GetBool(lvl.Config.LoadOnGoto), GetBool(lvl.Config.AutoUnload)); GetBool(cfg.LoadOnGoto), GetBool(cfg.AutoUnload));
Player.Message(p, " Buildable: {0}%S, Deletable: {1}", Player.Message(p, " Buildable: {0}%S, Deletable: {1}",
GetBool(lvl.Config.Buildable), GetBool(lvl.Config.Deletable)); GetBool(cfg.Buildable), GetBool(cfg.Deletable));
} }
static string GetBool(bool value, bool console = false) { static string GetBool(bool value, bool console = false) {