Fix AlwaysSword may give swords to spectators

MetallicGoat · Aug 9, 2024 · 6b3a6ea · 6b3a6ea
1 parent aeabb16
commit 6b3a6ea
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/me/metallicgoat/tweaksaddon/tweaks/advancedswords/AlwaysSword.java b/src/main/java/me/metallicgoat/tweaksaddon/tweaks/advancedswords/AlwaysSword.java
@@ -1,6 +1,7 @@
 package me.metallicgoat.tweaksaddon.tweaks.advancedswords;
 
 import de.marcely.bedwars.api.BedwarsAPI;
+import de.marcely.bedwars.api.GameAPI;
 import de.marcely.bedwars.api.arena.Arena;
 import de.marcely.bedwars.api.arena.ArenaStatus;
 import me.metallicgoat.tweaksaddon.MBedwarsTweaksPlugin;
@@ -41,6 +42,13 @@ public void onClick(InventoryClickEvent e) {
         runningTasks.get(player).cancel();
 
       runningTasks.put(player, Bukkit.getServer().getScheduler().runTaskLater((MBedwarsTweaksPlugin.getInstance()), () -> {
+        final Arena currArena = GameAPI.get().getArenaByPlayer(player);
+
+        if (currArena != arena || !arena.getPlayers().contains(player) || arena.getSpectators().contains(player)) {
+          runningTasks.remove(player);
+          return;
+        }
+
         final Inventory pi = player.getInventory();
         final int i = ToolSwordHelper.getSwordsAmount(player);