From e13aa525bd067087701c27dbb8087c06f359febe Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 28 Aug 2016 10:02:46 +1000 Subject: [PATCH] Fix /os map deletable not working (Thanks Empy), fix level name in tab list when joining a museum showing 'museum' to you, but to others showing the full museum map name. --- Commands/CmdOverseer.cs | 2 +- Commands/World/CmdMuseum.cs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Commands/CmdOverseer.cs b/Commands/CmdOverseer.cs index 4447be35f..b4255b94a 100644 --- a/Commands/CmdOverseer.cs +++ b/Commands/CmdOverseer.cs @@ -212,7 +212,7 @@ namespace MCGalaxy.Commands { } else if (cmd == "BUILDABLE") { CmdMap.SetMapOption(p, p.level, "buildable", ""); } else if (cmd == "DELETABLE") { - CmdMap.SetMapOption(p, p.level, "deleteable", ""); + CmdMap.SetMapOption(p, p.level, "deletable", ""); } else { Player.MessageLines(p, mapHelp); } diff --git a/Commands/World/CmdMuseum.cs b/Commands/World/CmdMuseum.cs index 940b5db02..5a3662249 100644 --- a/Commands/World/CmdMuseum.cs +++ b/Commands/World/CmdMuseum.cs @@ -47,6 +47,11 @@ namespace MCGalaxy.Commands.World { lvl.jaily = (ushort)(lvl.spawny * 32); lvl.jailz = (ushort)(lvl.spawnz * 32); lvl.jailrotx = lvl.rotx; lvl.jailroty = lvl.roty; + + if (args.Length == 1) + lvl.name = "&cMuseum " + Server.DefaultColor + "(" + args[0] + ")"; + else + lvl.name = "&cMuseum " + Server.DefaultColor + "(" + args[0] + " " + args[1] + ")"; p.Loading = true; Entities.DespawnEntities(p); @@ -64,11 +69,6 @@ namespace MCGalaxy.Commands.World { p.ClearBlockchange(); p.Loading = false; - if (args.Length == 1) - lvl.name = "&cMuseum " + Server.DefaultColor + "(" + args[0] + ")"; - else - lvl.name = "&cMuseum " + Server.DefaultColor + "(" + args[0] + " " + args[1] + ")"; - Chat.MessageWhere("{0} %Swent to the {1}", pl => Entities.CanSee(pl, p), p.ColoredName, lvl.name); }