diff --git a/MCGalaxy/Commands/CPE/CmdModel.cs b/MCGalaxy/Commands/CPE/CmdModel.cs index 8825d6b19..1640abcaf 100644 --- a/MCGalaxy/Commands/CPE/CmdModel.cs +++ b/MCGalaxy/Commands/CPE/CmdModel.cs @@ -21,7 +21,6 @@ using MCGalaxy.Bots; namespace MCGalaxy.Commands.CPE { public class CmdModel : EntityPropertyCmd { public override string name { get { return "Model"; } } - public override string shortcut { get { return "SetModel"; } } public override string type { get { return CommandTypes.Other; } } public override LevelPermission defaultRank { get { return LevelPermission.AdvBuilder; } } public override CommandPerm[] ExtraPerms { diff --git a/MCGalaxy/Commands/Command.cs b/MCGalaxy/Commands/Command.cs index 96a5ebd7a..c66207fbf 100644 --- a/MCGalaxy/Commands/Command.cs +++ b/MCGalaxy/Commands/Command.cs @@ -18,8 +18,8 @@ using System; using System.Collections.Generic; using System.Reflection; -using MCGalaxy.Maths; using MCGalaxy.Commands; +using MCGalaxy.Maths; using MCGalaxy.Scripting; namespace MCGalaxy { @@ -105,8 +105,8 @@ namespace MCGalaxy { grp.Commands.Remove(cmd); } - // typically Command.Unregister(Command.Find("xyz")) - // So don't error if Command.Find returned null + // typical usage: Command.Unregister(Command.Find("xyz")) + // So don't throw exception if Command.Find returned null if (cmd != null) Alias.UnregisterDefaults(cmd); return removed; } @@ -163,7 +163,7 @@ namespace MCGalaxy { public bool Remove(Command cmd) { return Command.Unregister(cmd); } [Obsolete("Use Command.Find() instead")] - public Command FindByName(string name) { return Command.Find(name); } + public Command FindByName(string name) { return Command.Find(name); } [Obsolete("Use Command.Find() instead")] public Command Find(string name) { foreach (Command cmd in Command.allCmds) { diff --git a/MCGalaxy/Commands/Moderation/ZoneCmds.cs b/MCGalaxy/Commands/Moderation/ZoneCmds.cs index d5201930a..666537cd5 100644 --- a/MCGalaxy/Commands/Moderation/ZoneCmds.cs +++ b/MCGalaxy/Commands/Moderation/ZoneCmds.cs @@ -242,7 +242,6 @@ namespace MCGalaxy.Commands.Moderation { public override string name { get { return "ZoneMark"; } } public override string shortcut { get { return "ZMark"; } } public override string type { get { return CommandTypes.Building; } } - public override bool museumUsable { get { return false; } } public override bool SuperUseable { get { return false; } } public override CommandAlias[] Aliases { get { return new[] { new CommandAlias("zm") }; } diff --git a/MCGalaxy/util/Math/Vectors.cs b/MCGalaxy/util/Math/Vectors.cs index 7c547cb6b..1634249ab 100644 --- a/MCGalaxy/util/Math/Vectors.cs +++ b/MCGalaxy/util/Math/Vectors.cs @@ -239,15 +239,10 @@ namespace MCGalaxy.Maths { public static bool operator != (Vec3F32 a, Vec3F32 b) { return a.X != b.X || a.Y != b.Y || a.Z != b.Z; - } - + } public override string ToString() { return X + "," + Y + "," + Z; } - - public string ToString(string separator) { - return string.Format("{1}{0}{2}{0}{3}", separator, X, Y, Z); - } } }