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

Keep /os spawn as alias for /os setspawn

Browse Source
This commit is contained in:
UnknownShadow200 2017-09-08 12:50:06 +10:00
parent 1d92aa8f8e
commit e912687a6d
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MCGalaxy/Commands/World/CmdLoad.cs
View File

@ -45,20 +45,21 @@ namespace MCGalaxy.Commands.World {
} }
static Level LoadLevelCore(Player p, string name, bool autoLoaded) { static Level LoadLevelCore(Player p, string name, bool autoLoaded) {
Level[] loaded = LevelInfo.Loaded.Items;
foreach (Level l in loaded) {
if (l.name == name) { Player.Message(p, "Level {0} %Sis already loaded.", l.ColoredName); return null; }
}
if (!LevelInfo.MapExists(name)) { if (!LevelInfo.MapExists(name)) {
Player.Message(p, "Level \"{0}\" does not exist", name); return null; Player.Message(p, "Level \"{0}\" does not exist", name); return null;
} }
Level existing = LevelInfo.FindExact(name);
if (existing != null) {
Player.Message(p, "Level {0} %Sis already loaded.", existing.ColoredName); return null;
}
Level lvl = ReadLevel(p, name); Level lvl = ReadLevel(p, name);
if (lvl == null || !lvl.CanJoin(p)) return null; if (lvl == null || !lvl.CanJoin(p)) return null;
loaded = LevelInfo.Loaded.Items; existing = LevelInfo.FindExact(name);
foreach (Level l in loaded) { if (existing != null) {
if (l.name == name) { Player.Message(p, "Level {0} %Sis already loaded.", l.ColoredName); return null; } Player.Message(p, "Level {0} %Sis already loaded.", existing.ColoredName); return null;
} }
LevelInfo.Loaded.Add(lvl); LevelInfo.Loaded.Add(lvl);

12
MCGalaxy/Commands/World/CmdOverseer.cs
View File

@ -32,16 +32,18 @@ namespace MCGalaxy.Commands.World {
public override void Use(Player p, string message) { public override void Use(Player p, string message) {
if (message.Length == 0) { Help(p); return; } if (message.Length == 0) { Help(p); return; }
string[] parts = message.SplitSpaces(3); string[] args = message.SplitSpaces(3);
string cmd = parts[0].ToUpper(); string cmd = args[0];
string arg = parts.Length > 1 ? parts[1] : ""; string arg = args.Length > 1 ? args[1] : "";
string arg2 = parts.Length > 2 ? parts[2] : ""; string arg2 = args.Length > 2 ? args[2] : "";
bool mapOnly = !(cmd == "GO" || cmd == "MAP"); bool mapOnly = !(cmd.CaselessEq("go") || cmd.CaselessEq("map"));
if (mapOnly && !OwnsMap(p, p.level)) { if (mapOnly && !OwnsMap(p, p.level)) {
Player.Message(p, "You may only perform that action on your own map."); return; Player.Message(p, "You may only perform that action on your own map."); return;
} }
// used to be /os spawn, keep alias for backwards compatibility
if (cmd.CaselessEq("spawn")) cmd = "setspawn";
foreach (var subCmd in subCommands) { foreach (var subCmd in subCommands) {
if (!subCmd.Key.CaselessEq(cmd)) continue; if (!subCmd.Key.CaselessEq(cmd)) continue;
subCmd.Value.Handler(p, arg, arg2); subCmd.Value.Handler(p, arg, arg2);