diff --git a/Commands/CPE/CmdModel.cs b/Commands/CPE/CmdModel.cs index 544a25ad9..1ffdad657 100644 --- a/Commands/CPE/CmdModel.cs +++ b/Commands/CPE/CmdModel.cs @@ -67,6 +67,7 @@ namespace MCGalaxy.Commands.CPE { model = message; } model = model.ToLower(); + if ((isBot || who != p) && !CheckExtraPerm(p)) { MessageNeedPerms(p, "can change the model of other players."); return; } if (isBot) { pBot.model = model; diff --git a/Commands/CPE/CmdSkin.cs b/Commands/CPE/CmdSkin.cs index 140912764..6f32899a5 100644 --- a/Commands/CPE/CmdSkin.cs +++ b/Commands/CPE/CmdSkin.cs @@ -27,6 +27,9 @@ namespace MCGalaxy.Commands.CPE { public override string type { get { return CommandTypes.Other; } } public override bool museumUsable { get { return true; } } public override LevelPermission defaultRank { get { return LevelPermission.Operator; } } + public override CommandPerm[] AdditionalPerms { + get { return new[] { new CommandPerm(LevelPermission.Operator, "+ can change the skin of other players") }; } + } static char[] trimChars = { ' ' }; public override void Use(Player p, string message) { @@ -58,6 +61,8 @@ namespace MCGalaxy.Commands.CPE { if (!Player.ValidName(skin)) { Player.Message(p, "\"" + skin + "\" is not a valid skin name."); return; } + if ((isBot || who != p) && !CheckExtraPerm(p)) { MessageNeedPerms(p, "can change the skin of other players."); return; } + if (isBot) { pBot.skinName = skin; pBot.GlobalDespawn(); diff --git a/Commands/CmdOverseer.cs b/Commands/CmdOverseer.cs index be785a861..4159f3347 100644 --- a/Commands/CmdOverseer.cs +++ b/Commands/CmdOverseer.cs @@ -297,7 +297,7 @@ namespace MCGalaxy.Commands // I need to add the ability to delete a single zone, I need help! if (value == "ALL" || value == "") { Command zone = Command.all.Find("zone"); - Command click = Command.all.Find("click"); + Command click = Command.all.Find("mark"); zone.Use(p, "del all"); click.Use(p, "0 0 0"); } diff --git a/GUI/Window.Designer.cs b/GUI/Window.Designer.cs index 5876d9f81..b289c6495 100644 --- a/GUI/Window.Designer.cs +++ b/GUI/Window.Designer.cs @@ -40,18 +40,6 @@ namespace MCGalaxy.Gui base.Dispose(disposing); } - protected override void WndProc(ref Message msg) - { - /*const int WM_SIZE = 0x0005; - const int SIZE_MINIMIZED = 1; - if ((msg.Msg == WM_SIZE) && ((int)msg.WParam == SIZE_MINIMIZED) && (Window.Minimize != null)) - { - this.Window_Minimize(this, EventArgs.Empty); - }*/ - - base.WndProc(ref msg); - } - #region Windows Form Designer generated code ///