From d535203a48380f188488b2b017097c6251e20642 Mon Sep 17 00:00:00 2001
From: Simon Chuu <simonorj@outlook.com>
Date: Wed, 29 May 2019 02:50:48 -0400
Subject: [PATCH] Ignore new chunks on chunk load event

---
 src/main/java/com/simonorj/mc/phantomsmp/PhantomListener.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/simonorj/mc/phantomsmp/PhantomListener.java b/src/main/java/com/simonorj/mc/phantomsmp/PhantomListener.java
index d9320ee..218d684 100644
--- a/src/main/java/com/simonorj/mc/phantomsmp/PhantomListener.java
+++ b/src/main/java/com/simonorj/mc/phantomsmp/PhantomListener.java
@@ -25,7 +25,7 @@ public class PhantomListener implements Listener {
     private static final String DISALLOW_SPAWN_PERM = "phantomsmp.disallowspawn";
     private static final String IGNORE_PERM = "phantomsmp.ignore";
 
-    private final Map<Player, LinkedHashSet<Phantom>> playerPhantomMap = new HashMap<>();
+    private final Map<Player, Set<Phantom>> playerPhantomMap = new HashMap<>();
     private final Map<Phantom, Player> phantomPlayerMap = new HashMap<>();
     private final Set<Phantom> newPhantom = new LinkedHashSet<>();
     private final PhantomSMP plugin;
@@ -182,7 +182,7 @@ public class PhantomListener implements Listener {
 
     @EventHandler
     public void onPhantomInLoadedChunk(ChunkLoadEvent e) {
-        if (e.getWorld().getEnvironment() != World.Environment.NORMAL)
+        if (e.isNewChunk() || e.getWorld().getEnvironment() != World.Environment.NORMAL)
             return;
 
         for (Entity ent : e.getChunk().getEntities())