Prevent creating MBs with non-existent commands

ClassiCube · Apr 28, 2024 · 9ec7f27 · 9ec7f27
1 parent 4725607
commit 9ec7f27
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/MCGalaxy/Blocks/Extended/MessageBlock.cs b/MCGalaxy/Blocks/Extended/MessageBlock.cs
@@ -58,7 +58,9 @@ public static void Execute(Player p, string message, Vec3S32 mbCoords) {
         public static bool Validate(Player p, string message, bool allCmds) {
             string text;
             List<string> cmds = MessageBlock.GetParts(message, out text);
-            foreach (string cmd in cmds) {
+
+            foreach (string cmd in cmds) 
+            {
                 if (!CheckCommand(p, cmd, allCmds)) return false;
             }
             return true;
@@ -70,7 +72,10 @@ static bool CheckCommand(Player p, string message, bool allCmds) {
             Command.Search(ref cmdName, ref cmdArgs);
 
             Command cmd = Command.Find(cmdName);
-            if (cmd == null) return true;
+            if (cmd == null) {
+                p.Message("Unknown command &T/{0} &Scannot be used in a messageblock", cmdName);
+                return false;	
+            }
 
             if (p.CanUse(cmd) && (allCmds || !cmd.MessageBlockRestricted)) return true;
             p.Message("You cannot use &T/{0} &Sin a messageblock.", cmd.name);

diff --git a/MCGalaxy/Server/Maintenance/Updater.cs b/MCGalaxy/Server/Maintenance/Updater.cs
@@ -18,6 +18,7 @@ permissions and limitations under the Licenses.
 using System;
 using System.Net;
 using MCGalaxy.Network;
+using MCGalaxy.Platform;
 using MCGalaxy.Tasks;
 
 namespace MCGalaxy