From 048bf3113c163a05071024892fe9f000533f1423 Mon Sep 17 00:00:00 2001
From: Daniel Saukel <Sataniel98@users.noreply.github.com>
Date: Thu, 8 Jul 2021 17:44:40 +0200
Subject: [PATCH] Fix new GlobalPlayer instances not being wiped on quit

---
 core/src/main/java/de/erethon/dungeonsxl/player/DGroup.java   | 4 ++--
 .../java/de/erethon/dungeonsxl/player/DPlayerListener.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/de/erethon/dungeonsxl/player/DGroup.java b/core/src/main/java/de/erethon/dungeonsxl/player/DGroup.java
index c52dc3cf..547ce441 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/player/DGroup.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/player/DGroup.java
@@ -589,8 +589,8 @@ public class DGroup implements PlayerGroup {
         for (UUID playerId : getMembers()) {
             GlobalPlayer player = plugin.getPlayerCache().get(playerId);
             if (!(player instanceof DGamePlayer)) {
-                plugin.log("Player isn't a DGamePlayer");
-                continue;
+                plugin.log("[ERROR] Player isn't a DGamePlayer, registry: " + plugin.getPlayerCache().getAll());
+                return;
             }
             ((DGamePlayer) player).startGame();
         }
diff --git a/core/src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java b/core/src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java
index 130979ee..7ddfa555 100644
--- a/core/src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java
+++ b/core/src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java
@@ -454,7 +454,7 @@ public class DPlayerListener implements Listener {
             ((InstancePlayer) dPlayer).leave();
         }
 
-        plugin.getPlayerCache().remove(dPlayer);
+        plugin.getPlayerCache().remove(plugin.getPlayerCache().get(player));
     }
 
     @EventHandler