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.

This commit is contained in:
UnknownShadow200 2016-08-28 10:02:46 +10:00
parent 5cd7051b48
commit e13aa525bd
2 changed files with 6 additions and 6 deletions

View File

@ -212,7 +212,7 @@ namespace MCGalaxy.Commands {
} else if (cmd == "BUILDABLE") { } else if (cmd == "BUILDABLE") {
CmdMap.SetMapOption(p, p.level, "buildable", ""); CmdMap.SetMapOption(p, p.level, "buildable", "");
} else if (cmd == "DELETABLE") { } else if (cmd == "DELETABLE") {
CmdMap.SetMapOption(p, p.level, "deleteable", ""); CmdMap.SetMapOption(p, p.level, "deletable", "");
} else { } else {
Player.MessageLines(p, mapHelp); Player.MessageLines(p, mapHelp);
} }

View File

@ -47,6 +47,11 @@ namespace MCGalaxy.Commands.World {
lvl.jaily = (ushort)(lvl.spawny * 32); lvl.jaily = (ushort)(lvl.spawny * 32);
lvl.jailz = (ushort)(lvl.spawnz * 32); lvl.jailz = (ushort)(lvl.spawnz * 32);
lvl.jailrotx = lvl.rotx; lvl.jailroty = lvl.roty; 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; p.Loading = true;
Entities.DespawnEntities(p); Entities.DespawnEntities(p);
@ -64,11 +69,6 @@ namespace MCGalaxy.Commands.World {
p.ClearBlockchange(); p.ClearBlockchange();
p.Loading = false; 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}", Chat.MessageWhere("{0} %Swent to the {1}",
pl => Entities.CanSee(pl, p), p.ColoredName, lvl.name); pl => Entities.CanSee(pl, p), p.ColoredName, lvl.name);
} }