From cc4d005d5f7f0a94b7f61c485d2fd00644b256cc Mon Sep 17 00:00:00 2001
From: Nathan Curran <30569566+Focusvity@users.noreply.github.com>
Date: Tue, 15 Jun 2021 23:33:22 +1000
Subject: [PATCH] Fix Codacy isues

---
 .../java/me/totalfreedom/tfguilds/command/GuildCommand.java  | 5 +++++
 src/main/java/me/totalfreedom/tfguilds/guild/Guild.java      | 2 +-
 src/main/java/me/totalfreedom/tfguilds/util/GUtil.java       | 5 +++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java b/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java
index b2a9fae..0589b2c 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/GuildCommand.java
@@ -138,6 +138,11 @@ public class GuildCommand extends Common implements CommandExecutor, TabComplete
                         return guild.getMemberNames();
                     }
                 }
+
+                default:
+                {
+                    return Collections.emptyList();
+                }
             }
         }
         return Collections.emptyList();
diff --git a/src/main/java/me/totalfreedom/tfguilds/guild/Guild.java b/src/main/java/me/totalfreedom/tfguilds/guild/Guild.java
index d65701f..7ad1758 100644
--- a/src/main/java/me/totalfreedom/tfguilds/guild/Guild.java
+++ b/src/main/java/me/totalfreedom/tfguilds/guild/Guild.java
@@ -825,7 +825,7 @@ public class Guild
 
             if (Common.GUILD_CHAT_SPY.contains(p) && player != p && !isMember(p))
             {
-                p.sendMessage(GUtil.colorize("&7[&bGuild Chat Spy &7| &b" + name + "&7] " + player.getName() + " &8\u00BB &6") + message);
+                p.sendMessage(GUtil.colorize("&7[&bGuild " + (modChat ? "Mod " : "") + "Chat Spy &7| &b" + name + "&7] " + player.getName() + " &8\u00BB &6") + message);
             }
         }
     }
diff --git a/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java b/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java
index a39f96c..183926b 100644
--- a/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java
+++ b/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java
@@ -40,15 +40,16 @@ public class GUtil
 
     public static String removeColorCodes(String string)
     {
+        String s = null;
         if (string != null)
         {
             Matcher matcher = CHAT_COLOR_FORMAT.matcher(string);
             while (matcher.find())
             {
-                string = string.replaceAll(matcher.group(), "");
+                s = string.replaceAll(matcher.group(), "");
             }
         }
-        return string;
+        return s;
     }
 
     public static boolean containsBlacklistedWord(String string)