From d1e8f4d8fac6deef8769621ab7f26127b30d1b83 Mon Sep 17 00:00:00 2001
From: business-goose <arclicious@vivaldi.net>
Date: Wed, 23 Mar 2022 23:15:51 +0000
Subject: [PATCH] Prevent SILLY ADMINS from abusing /wildcard & /gcmd to do
 STUPID RECURSIVE things

---
 .../TotalFreedomMod/commands/Command_gcmd.java         |  8 ++++++++
 .../TotalFreedomMod/commands/Command_wildcard.java     | 10 ++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gcmd.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gcmd.java
index e4f3c3b..17a8690 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gcmd.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_gcmd.java
@@ -2,6 +2,7 @@ package me.StevenLawson.TotalFreedomMod.commands;
 
 import me.StevenLawson.TotalFreedomMod.command.CommandBlocker;
 import org.apache.commons.lang3.StringUtils;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -15,6 +16,13 @@ public class Command_gcmd extends FreedomCommand {
             return false;
         }
 
+        String arguments = String.join(" ", args);
+
+        if (arguments.toLowerCase().contains("wildcard") || arguments.toLowerCase().contains("gcmd")) {
+            playerMsg("What the hell are you trying to do, you stupid idiot...", ChatColor.RED);
+            return true;
+        }
+
         final Player player = getPlayer(args[0]);
 
         if (player == null) {
diff --git a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wildcard.java b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wildcard.java
index 4e34470..1b96157 100644
--- a/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wildcard.java
+++ b/src/main/java/me/StevenLawson/TotalFreedomMod/commands/Command_wildcard.java
@@ -16,21 +16,23 @@ public class Command_wildcard extends FreedomCommand {
             return false;
         }
 
-        if (args[0].toLowerCase().contains("wildcard") || args[0].toLowerCase().contains("gcmd")) {
+        String arguments = String.join(" ", args);
+        
+        if (arguments.toLowerCase().contains("wildcard") || arguments.toLowerCase().contains("gcmd")) {
             playerMsg("What the hell are you trying to do, you stupid idiot...", ChatColor.RED);
             return true;
         }
-        if (args[0].toLowerCase().contains("gtfo"))
+        if (arguments.toLowerCase().contains("gtfo"))
         {
             playerMsg("Nice try", ChatColor.RED);
             return true;
         }
-        if (args[0].toLowerCase().contains("doom"))
+        if (arguments.toLowerCase().contains("doom"))
         {
             playerMsg("Look, we all hate people, but this is not the way to deal with it, doom is evil enough!", ChatColor.RED);
             return true;
         }
-        if (args[0].toLowerCase().contains("saconfig"))
+        if (arguments.toLowerCase().contains("saconfig"))
         {
             playerMsg("WOA, WTF are you trying to do???", ChatColor.RED);
             return true;