SpoilPlayerTNTFeature code improvements (#892)

SpoilPlayerTNTFeature code improvements
andrei1058 · Oct 31, 2023 · 8e66b27 · 8e66b27
1 parent d6f167f
commit 8e66b27
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/arena/feature/SpoilPlayerTNTFeature.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/arena/feature/SpoilPlayerTNTFeature.java
@@ -122,14 +122,23 @@ public void onPlace(BlockPlaceEvent event) {
         public void inventorySwitch(InventoryCloseEvent event) {
             Player player = (Player) event.getPlayer();
             IArena arena = Arena.getArenaByPlayer(player);
-            if (arena == null || !arena.isPlayer(player) || arena.isSpectator(player)) return;
+
+            // Ensure the player is in an arena, is not a spectator, and is indeed a player
+            if (arena == null || !arena.isPlayer(player) || arena.isSpectator(player)) {
+                return;
+            }
+
+            boolean hasTnt = player.getInventory().contains(Material.TNT);
+
             if (instance.playersWithTnt.contains(player)) {
-                if (player.getInventory().contains(Material.TNT)) return;
-                instance.playersWithTnt.remove(player);
-            } else if (!instance.playersWithTnt.contains(player)) {
-                if (!player.getInventory().contains(Material.TNT)) return;
-                instance.playersWithTnt.add(player);
+                if (!hasTnt) {
+                    instance.playersWithTnt.remove(player);
+                }
+            } else {
+                if (hasTnt) {
+                    instance.playersWithTnt.add(player);
+                }
             }
         }
     }
-}
+}