diff --git a/Commands/Chat/CmdEat.cs b/Commands/Chat/CmdEat.cs index 064d4e652..8e9c32ba2 100644 --- a/Commands/Chat/CmdEat.cs +++ b/Commands/Chat/CmdEat.cs @@ -60,7 +60,7 @@ namespace MCGalaxy.Commands { if (!p.level.worldChat) { Chat.GlobalChatLevel(p, "" + p.ColoredName + " %S" + action, false); } else { - Player.SendChatFrom(p, p.ColoredName + "%S " + action); + Player.SendChatFrom(p, " %S" + action); } } diff --git a/Commands/CmdOverseer.cs b/Commands/CmdOverseer.cs index 1115cc3f6..c361a9c90 100644 --- a/Commands/CmdOverseer.cs +++ b/Commands/CmdOverseer.cs @@ -126,7 +126,7 @@ namespace MCGalaxy.Commands } void HandleMapCommand(Player p, string message, string cmd, string value) { - bool mapOnly = cmd == "PHYSICS" || cmd == "MOTD" || cmd == "GUNS" || + bool mapOnly = cmd == "PHYSICS" || cmd == "MOTD" || cmd == "GUNS" || cmd == "CHAT" || cmd == "RESTORE" || cmd == "PERVISIT" || cmd == "TEXTURE" || cmd == "BUILDABLE" || cmd == "DELETEABLE"; if (mapOnly && !p.level.name.CaselessStarts(p.name)) { Player.SendMessage(p, "You may only perform that action on your own map."); @@ -217,6 +217,10 @@ namespace MCGalaxy.Commands } } else if (cmd == "GUNS") { Command.all.Find("allowguns").Use(p, ""); + } else if (cmd == "CHAT") { + Command.all.Find("map").Use(p, "chat"); + } else if (cmd == "RESTORE") { + Command.all.Find("restore").Use(p, value); } else if (cmd == "PERVISIT") { string rank = value == "" ? Server.defaultRank : value; Command.all.Find("pervisit").Use(p, rank); @@ -241,7 +245,9 @@ namespace MCGalaxy.Commands Player.SendMessage(p, "/os map add [width] [height] [length] [type] -- Creates your map"); Player.SendMessage(p, "/os map physics -- Sets the physics on your map."); Player.SendMessage(p, "/os map delete -- Deletes your map"); + Player.SendMessage(p, "/os map restore [num] -- Restores backup [num] of your map"); Player.SendMessage(p, "/os map save -- Saves your map"); + Player.SendMessage(p, "/os map chat -- Sets whether roleplay (level only) chat is used."); Player.SendMessage(p, "/os map motd -- Changes the motd of your map"); Player.SendMessage(p, "/os map guns -- Toggles if guns can be used on your map"); Player.SendMessage(p, "/os map pervisit %b[default is " + Server.defaultRank + "]%S -- Changes the pervisit of you map"); diff --git a/Commands/World/CmdMap.cs b/Commands/World/CmdMap.cs index b8d982889..3fdf63314 100644 --- a/Commands/World/CmdMap.cs +++ b/Commands/World/CmdMap.cs @@ -60,7 +60,7 @@ namespace MCGalaxy.Commands Player.SendMessage(p, "Killer blocks: " + GetBool(lvl.Killer)); Player.SendMessage(p, "Unload: " + GetBool(lvl.unload)); Player.SendMessage(p, "Load on /goto: " + GetBool(lvl.loadOnGoto)); - Player.SendMessage(p, "Role play (level only) chat: " + GetBool(!lvl.worldChat)); + Player.SendMessage(p, "Roleplay (level only) chat: " + GetBool(!lvl.worldChat)); Player.SendMessage(p, "Guns: " + GetBool(lvl.guns)); Player.SendMessage(p, "Buildable: " + GetBool(lvl.Buildable)); Player.SendMessage(p, "Deletable: " + GetBool(lvl.Deletable)); @@ -120,7 +120,7 @@ namespace MCGalaxy.Commands case "unload": SetBool(p, lvl, ref lvl.unload, "Auto unload: "); break; case "chat": - SetBool(p, lvl, ref lvl.worldChat, "Role play (level only) chat: ", true); break; + SetBool(p, lvl, ref lvl.worldChat, "Roleplay (level only) chat: ", true); break; case "load": case "autoload": case "loadongoto":