Trigger warning when player leave event fires without join event bein…

…g called Join event sets up the phantom list for specific player(s).
chuushi · May 29, 2019 · eeeac81 · eeeac81
1 parent 25759fa
commit eeeac81
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/com/simonorj/mc/phantomsmp/PhantomListener.java b/src/main/java/com/simonorj/mc/phantomsmp/PhantomListener.java
@@ -132,7 +132,14 @@ public void onPlayerJoin(PlayerJoinEvent e) {
     public void onPlayerLeave(PlayerQuitEvent e) {
         Player p = e.getPlayer();
 
-        for (Phantom phantom : playerPhantomMap.get(p)) {
+        Set<Phantom> phantoms = playerPhantomMap.get(p);
+
+        if (phantoms == null) {
+            plugin.getLogger().warning("Phantom list for '" + p.getName() + "' was not initiated! Was there an error during login?");
+            return;
+        }
+
+        for (Phantom phantom : phantoms) {
             if (phantom.getTarget() == p) {
                 phantom.setTarget(null);
                 phantomPlayerMap.remove(phantom);
@@ -173,7 +180,6 @@ public void onPhantomTargeting(EntityTargetLivingEntityEvent e) {
         targeting((Phantom) e.getEntity(), (Player) e.getTarget(), e);
     }
 
-    // Check phantom in loaded chunks
     @EventHandler
     public void onPhantomInLoadedChunk(ChunkLoadEvent e) {
         if (e.getWorld().getEnvironment() != World.Environment.NORMAL)
@@ -184,7 +190,6 @@ public void onPhantomInLoadedChunk(ChunkLoadEvent e) {
                 targeting((Phantom) ent, null, null);
     }
 
-    // Untrack phantoms in unloaded chunks
     @EventHandler
     public void onPhantomInUnloadedChunk(ChunkUnloadEvent e) {
         if (e.getWorld().getEnvironment() != World.Environment.NORMAL)