AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-10-02 18:13:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

ZoneMark should be allowed in museums

Browse Source
This commit is contained in:
UnknownShadow200 2020-06-11 20:05:45 +10:00
parent cee0ef96b9
commit 0a380c1731
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MCGalaxy/Commands/CPE/CmdModel.cs
View File

@ -21,7 +21,6 @@ using MCGalaxy.Bots;
namespace MCGalaxy.Commands.CPE { namespace MCGalaxy.Commands.CPE {
public class CmdModel : EntityPropertyCmd { public class CmdModel : EntityPropertyCmd {
public override string name { get { return "Model"; } } public override string name { get { return "Model"; } }
public override string shortcut { get { return "SetModel"; } }
public override string type { get { return CommandTypes.Other; } } public override string type { get { return CommandTypes.Other; } }
public override LevelPermission defaultRank { get { return LevelPermission.AdvBuilder; } } public override LevelPermission defaultRank { get { return LevelPermission.AdvBuilder; } }
public override CommandPerm[] ExtraPerms { public override CommandPerm[] ExtraPerms {

8
MCGalaxy/Commands/Command.cs
View File

@ -18,8 +18,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using MCGalaxy.Maths;
using MCGalaxy.Commands; using MCGalaxy.Commands;
using MCGalaxy.Maths;
using MCGalaxy.Scripting; using MCGalaxy.Scripting;
namespace MCGalaxy { namespace MCGalaxy {
@ -105,8 +105,8 @@ namespace MCGalaxy {
grp.Commands.Remove(cmd); grp.Commands.Remove(cmd);
} }
// typically Command.Unregister(Command.Find("xyz")) // typical usage: Command.Unregister(Command.Find("xyz"))
// So don't error if Command.Find returned null // So don't throw exception if Command.Find returned null
if (cmd != null) Alias.UnregisterDefaults(cmd); if (cmd != null) Alias.UnregisterDefaults(cmd);
return removed; return removed;
} }
@ -163,7 +163,7 @@ namespace MCGalaxy {
public bool Remove(Command cmd) { return Command.Unregister(cmd); } public bool Remove(Command cmd) { return Command.Unregister(cmd); }
[Obsolete("Use Command.Find() instead")] [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")] [Obsolete("Use Command.Find() instead")]
public Command Find(string name) { public Command Find(string name) {
foreach (Command cmd in Command.allCmds) { foreach (Command cmd in Command.allCmds) {

1
MCGalaxy/Commands/Moderation/ZoneCmds.cs
View File

@ -242,7 +242,6 @@ namespace MCGalaxy.Commands.Moderation {
public override string name { get { return "ZoneMark"; } } public override string name { get { return "ZoneMark"; } }
public override string shortcut { get { return "ZMark"; } } public override string shortcut { get { return "ZMark"; } }
public override string type { get { return CommandTypes.Building; } } public override string type { get { return CommandTypes.Building; } }
public override bool museumUsable { get { return false; } }
public override bool SuperUseable { get { return false; } } public override bool SuperUseable { get { return false; } }
public override CommandAlias[] Aliases { public override CommandAlias[] Aliases {
get { return new[] { new CommandAlias("zm") }; } get { return new[] { new CommandAlias("zm") }; }

7
MCGalaxy/util/Math/Vectors.cs
View File

@ -239,15 +239,10 @@ namespace MCGalaxy.Maths {
public static bool operator != (Vec3F32 a, Vec3F32 b) { public static bool operator != (Vec3F32 a, Vec3F32 b) {
return a.X != b.X || a.Y != b.Y || a.Z != b.Z; return a.X != b.X || a.Y != b.Y || a.Z != b.Z;
} }
public override string ToString() { public override string ToString() {
return X + "," + Y + "," + Z; return X + "," + Y + "," + Z;
} }
public string ToString(string separator) {
return string.Format("{1}{0}{2}{0}{3}", separator, X, Y, Z);
}
} }
} }