Quit/RageQuit/Hacks/CrashServer should not be usable from console/IRC

Also fix LeaveServer to do nothing when used by console/IRC, instead of throwing an exception
ClassiCube · May 9, 2020 · e3ef369 · e3ef369
1 parent 2dee378
commit e3ef369
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/MCGalaxy/Commands/other/QuitCmds.cs b/MCGalaxy/Commands/other/QuitCmds.cs
@@ -25,6 +25,7 @@ public sealed class CmdRagequit : Command2 {
         public override string shortcut { get { return "rq"; } }
         public override string type { get { return CommandTypes.Other; } }
         public override bool MessageBlockRestricted { get { return true; } }
+        public override bool SuperUseable { get { return false; } }
 
         public override void Use(Player p, string message, CommandData data) {
             p.Leave("RAGEQUIT!!");
@@ -40,6 +41,7 @@ public sealed class CmdQuit : Command2 {
         public override string name { get { return "Quit"; } }
         public override string type { get { return CommandTypes.Other; } }
         public override bool MessageBlockRestricted { get { return true; } }
+        public override bool SuperUseable { get { return false; } }
 
         public override void Use(Player p, string message, CommandData data) {
             string msg = message.Length > 0 ? "Left the game: " + message : "Left the game.";
@@ -58,6 +60,7 @@ public sealed class CmdCrashServer : Command2 {
         public override string shortcut { get { return "Crash"; } }
         public override string type { get { return CommandTypes.Moderation; } }
         public override bool MessageBlockRestricted { get { return true; } }
+        public override bool SuperUseable { get { return false; } }
 
         public override void Use(Player p, string message, CommandData data) {
             if (message.Length > 0) { Help(p); return; }
@@ -76,6 +79,7 @@ public sealed class CmdHacks : Command2 {
         public override string shortcut { get { return "Hax"; } }
         public override string type { get { return CommandTypes.Moderation; } }
         public override bool MessageBlockRestricted { get { return true; } }
+        public override bool SuperUseable { get { return false; } }
 
         public override void Use(Player p, string message, CommandData data) {
             if (message.Length > 0) {

diff --git a/MCGalaxy/Player/Player.cs b/MCGalaxy/Player/Player.cs
@@ -213,7 +213,7 @@ public partial class Player : Entity, IDisposable {
 
         bool leftServer = false;
         void LeaveServer(string chatMsg, string discMsg, bool isKick, bool sync = false) {
-            if (leftServer) return;
+            if (leftServer || IsSuper) return;
             leftServer = true;
             CriticalTasks.Clear();
             ZoneIn = null;