diff options
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 1a605880..208e1622 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -596,6 +596,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (hiddenPlayers.containsKey(player.getName())) return; hiddenPlayers.put(player.getName(), player); + if (getHandle().netServerHandler == null) { + return; + } + //remove this player from the hidden player's EntityTrackerEntry EntityTracker tracker = ((WorldServer) entity.world).tracker; EntityPlayer other = ((CraftPlayer) player).getHandle(); @@ -614,6 +618,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (!hiddenPlayers.containsKey(player.getName())) return; hiddenPlayers.remove(player.getName()); + if (getHandle().netServerHandler == null) { + return; + } + EntityTracker tracker = ((WorldServer) entity.world).tracker; EntityPlayer other = ((CraftPlayer) player).getHandle(); EntityTrackerEntry entry = (EntityTrackerEntry) tracker.trackedEntities.get(other.id); |