fix: another NPE en kick - closes #164

Eredrim · Jan 31, 2024 · ee4d808 · ee4d808
1 parent d2969e5
commit ee4d808
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/java/net/slipcor/pvparena/listeners/PlayerListener.java b/src/main/java/net/slipcor/pvparena/listeners/PlayerListener.java
@@ -699,11 +699,13 @@ public void onPlayerKicked(final PlayerKickEvent event) {
         final Player player = event.getPlayer();
         final ArenaPlayer arenaPlayer = ArenaPlayer.fromPlayer(player);
         final Arena arena = arenaPlayer.getArena();
-        if (arena == null && arenaPlayer.getQueuedArena() != null) {
-            for (ArenaModule mod : arenaPlayer.getQueuedArena().getMods()) {
-                if(mod.handleQueuedLeave(arenaPlayer)) {
-                    arenaPlayer.unload();
-                    return;
+        if (arena == null) {
+            if (arenaPlayer.getQueuedArena() != null) {
+                for (ArenaModule mod : arenaPlayer.getQueuedArena().getMods()) {
+                    if (mod.handleQueuedLeave(arenaPlayer)) {
+                        arenaPlayer.unload();
+                        return;
+                    }
                 }
             }
             return; // no fighting player => OUT