diff --git a/pom.xml b/pom.xml
index 7fdd42b9..583b3911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>tk.shanebee.hg</groupId>
     <artifactId>HungerGames</artifactId>
-    <version>5.2.3</version>
+    <version>5.2.4</version>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
diff --git a/src/main/java/tk/shanebee/hg/HG.java b/src/main/java/tk/shanebee/hg/HG.java
index 7100ca4e..84269133 100755
--- a/src/main/java/tk/shanebee/hg/HG.java
+++ b/src/main/java/tk/shanebee/hg/HG.java
@@ -171,8 +171,7 @@ public void loadPlugin(boolean load) {
 				party = new Parties();
 			}
 
-		//noinspection ConstantConditions
-        getCommand("hg").setExecutor(new CommandListener(this));
+		getCommand("hg").setExecutor(new CommandListener(this));
 		if (load) {
             loadCmds();
         }
@@ -264,7 +263,6 @@ private void loadCmds() {
 		for (String bc : cmds.keySet()) {
 			getServer().getPluginManager().addPermission(new Permission("hg." + bc));
 			if (cArray.contains(bc))
-				//noinspection ConstantConditions
 				getServer().getPluginManager().getPermission("hg." + bc).setDefault(PermissionDefault.TRUE);
 
 		}
diff --git a/src/main/java/tk/shanebee/hg/data/ArenaConfig.java b/src/main/java/tk/shanebee/hg/data/ArenaConfig.java
index 1c263cdc..cc49b3a4 100755
--- a/src/main/java/tk/shanebee/hg/data/ArenaConfig.java
+++ b/src/main/java/tk/shanebee/hg/data/ArenaConfig.java
@@ -83,7 +83,6 @@ public void saveCustomConfig() {
 		}
 	}
 
-	@SuppressWarnings("ConstantConditions")
 	public void load() {
 		Util.log("Loading arenas...");
 		Configuration pluginConfig = plugin.getHGConfig().getConfig();
diff --git a/src/main/java/tk/shanebee/hg/data/Config.java b/src/main/java/tk/shanebee/hg/data/Config.java
index bdda4a38..6b01d040 100755
--- a/src/main/java/tk/shanebee/hg/data/Config.java
+++ b/src/main/java/tk/shanebee/hg/data/Config.java
@@ -199,7 +199,6 @@ private void loadConfig() {
     }
 
     // Used to update config
-    @SuppressWarnings("ConstantConditions")
     private void matchConfig(FileConfiguration config, File file) {
         try {
             boolean hasUpdated = false;
diff --git a/src/main/java/tk/shanebee/hg/data/Language.java b/src/main/java/tk/shanebee/hg/data/Language.java
index 81ed4ff2..9c12dc1d 100644
--- a/src/main/java/tk/shanebee/hg/data/Language.java
+++ b/src/main/java/tk/shanebee/hg/data/Language.java
@@ -209,7 +209,6 @@ private void loadLangFile() {
     }
 
     // Used to update config
-    @SuppressWarnings("ConstantConditions")
     private void matchConfig(FileConfiguration config, File file) {
         try {
             boolean hasUpdated = false;
diff --git a/src/main/java/tk/shanebee/hg/data/Leaderboard.java b/src/main/java/tk/shanebee/hg/data/Leaderboard.java
index a6ce5d40..f7403806 100644
--- a/src/main/java/tk/shanebee/hg/data/Leaderboard.java
+++ b/src/main/java/tk/shanebee/hg/data/Leaderboard.java
@@ -247,7 +247,6 @@ private void loadLeaderboard() {
 
     private void getLeaderboard(String path, Map<String, Integer> map, List<String> scores, List<String> players) {
         if (leaderboardConfig.getConfigurationSection(path) != null) {
-            //noinspection ConstantConditions
             for (String key : leaderboardConfig.getConfigurationSection(path).getKeys(false)) {
                 map.put(key, leaderboardConfig.getInt(path + "." + key));
             }
diff --git a/src/main/java/tk/shanebee/hg/data/PlayerData.java b/src/main/java/tk/shanebee/hg/data/PlayerData.java
index 040973de..fb158566 100755
--- a/src/main/java/tk/shanebee/hg/data/PlayerData.java
+++ b/src/main/java/tk/shanebee/hg/data/PlayerData.java
@@ -88,7 +88,6 @@ public void restore(Player player) {
     }
 
     // Restores later if player has an item in their inventory which changes their max health value
-    @SuppressWarnings("ConstantConditions")
     private void restoreHealth(Player player) {
         double att = player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue();
         if (health > att) {
diff --git a/src/main/java/tk/shanebee/hg/game/Board.java b/src/main/java/tk/shanebee/hg/game/Board.java
index 75853b0c..0dc94142 100644
--- a/src/main/java/tk/shanebee/hg/game/Board.java
+++ b/src/main/java/tk/shanebee/hg/game/Board.java
@@ -34,7 +34,6 @@ public class Board {
     private final Team team;
     private final String[] entries = new String[]{"&1&r", "&2&r", "&3&r", "&4&r", "&5&r", "&6&r", "&7&r", "&8&r", "&9&r", "&0&r", "&a&r", "&b&r", "&c&r", "&d&r", "&e&r"};
 
-    @SuppressWarnings("ConstantConditions")
     public Board(Game game) {
         this.game = game;
         this.plugin = game.plugin;
diff --git a/src/main/java/tk/shanebee/hg/game/GameBlockData.java b/src/main/java/tk/shanebee/hg/game/GameBlockData.java
index 6bf55d55..b20cf93e 100644
--- a/src/main/java/tk/shanebee/hg/game/GameBlockData.java
+++ b/src/main/java/tk/shanebee/hg/game/GameBlockData.java
@@ -204,7 +204,6 @@ void updateLobbyBlock() {
      * @param sign The sign to which the lobby will be set at
      * @return True if lobby is set
      */
-    @SuppressWarnings("ConstantConditions")
     public boolean setLobbyBlock(Sign sign) {
         try {
             this.sign1 = sign;
diff --git a/src/main/java/tk/shanebee/hg/game/GameCommandData.java b/src/main/java/tk/shanebee/hg/game/GameCommandData.java
index db044426..e7b87200 100644
--- a/src/main/java/tk/shanebee/hg/game/GameCommandData.java
+++ b/src/main/java/tk/shanebee/hg/game/GameCommandData.java
@@ -46,7 +46,6 @@ public void addCommand(String command, CommandType type) {
      * @param commandType Type of command to run
      * @param player      The player involved (can be null)
      */
-    @SuppressWarnings("ConstantConditions")
     public void runCommands(CommandType commandType, @Nullable Player player) {
         if (commands == null) return;
         for (String command : commands) {
diff --git a/src/main/java/tk/shanebee/hg/managers/ItemStackManager.java b/src/main/java/tk/shanebee/hg/managers/ItemStackManager.java
index 93b06811..86e07c0a 100755
--- a/src/main/java/tk/shanebee/hg/managers/ItemStackManager.java
+++ b/src/main/java/tk/shanebee/hg/managers/ItemStackManager.java
@@ -62,7 +62,6 @@ public KitManager setGameKits(String gameName, Configuration config) {
         return kit;
     }
 
-    @SuppressWarnings("ConstantConditions")
     private void kitCreator(Configuration config, KitManager kit, @Nullable String gameName) {
         if (gameName == null) gameName = "";
         if (config.getConfigurationSection(gameName + "kits") == null) return;
diff --git a/src/main/java/tk/shanebee/hg/managers/PlayerManager.java b/src/main/java/tk/shanebee/hg/managers/PlayerManager.java
index c90ad450..4f32e925 100644
--- a/src/main/java/tk/shanebee/hg/managers/PlayerManager.java
+++ b/src/main/java/tk/shanebee/hg/managers/PlayerManager.java
@@ -204,7 +204,6 @@ public Game getGame(Player player) {
      * @param uuid UUID of player to get game
      * @return Game of player, null if player is not in a game
      */
-    @SuppressWarnings("ConstantConditions")
     @Nullable
     public Game getGame(UUID uuid) {
         if (hasPlayerData(uuid))