fix #178 (#232)

andrei1058 · Jan 10, 2022 · 8962f90 · 8962f90
1 parent 38285c8
commit 8962f90
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/arena/Arena.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/arena/Arena.java
@@ -2372,10 +2372,11 @@ public void destroyData() {
         for (IGenerator og : oreGenerators) {
             og.destroyData();
         }
+        isOnABase.entrySet().removeIf(entry -> entry.getValue().getArena().equals(this));
         for (ITeam bwt : teams) {
             bwt.destroyData();
         }
-        playerLocation.entrySet().removeIf(e -> e.getValue().getWorld().getName().equalsIgnoreCase(worldName));
+        playerLocation.entrySet().removeIf(e -> Objects.requireNonNull(e.getValue().getWorld()).getName().equalsIgnoreCase(worldName));
         teams = null;
         placed = null;
         nextEvents = null;

diff --git a/bedwars-plugin/src/main/java/com/andrei1058/bedwars/arena/upgrades/BaseListener.java b/bedwars-plugin/src/main/java/com/andrei1058/bedwars/arena/upgrades/BaseListener.java
@@ -25,6 +25,7 @@
 import com.andrei1058.bedwars.api.arena.team.ITeam;
 import com.andrei1058.bedwars.api.events.player.PlayerBaseEnterEvent;
 import com.andrei1058.bedwars.api.events.player.PlayerBaseLeaveEvent;
+import com.andrei1058.bedwars.api.events.player.PlayerLeaveArenaEvent;
 import com.andrei1058.bedwars.api.events.upgrades.UpgradeBuyEvent;
 import com.andrei1058.bedwars.api.upgrades.EnemyBaseEnterTrap;
 import com.andrei1058.bedwars.arena.Arena;
@@ -191,4 +192,9 @@ public void onBaseLeave(PlayerBaseLeaveEvent e) {
             }
         }*/
     }
+
+    @EventHandler
+    public void onArenaLeave(PlayerLeaveArenaEvent event){
+        isOnABase.remove(event.getPlayer());
+    }
 }