summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorfeildmaster <admin@feildmaster.com>2012-04-27 12:48:40 -0500
committerfeildmaster <admin@feildmaster.com>2012-04-27 12:48:40 -0500
commit2f976705be7b68de8c115defe98552f73df38266 (patch)
treeaff506401fa082fde5501772da9ff211690431b2 /src/main/java
parent99aeb32d0d7368959d7a54808e0ac404dcd726fd (diff)
downloadcraftbukkit-2f976705be7b68de8c115defe98552f73df38266.tar
craftbukkit-2f976705be7b68de8c115defe98552f73df38266.tar.gz
craftbukkit-2f976705be7b68de8c115defe98552f73df38266.tar.lz
craftbukkit-2f976705be7b68de8c115defe98552f73df38266.tar.xz
craftbukkit-2f976705be7b68de8c115defe98552f73df38266.zip
Revert "Fix potential NPE in vanish API. Fixes BUKKIT-1541"
This reverts commit ebf121800bd3161e4af0f6d9229ccb39c31fc278. If the handle ever becomes null we need to know about it so we can debug it further.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 613963fc..ec269fcb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -591,10 +591,6 @@ 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();
@@ -613,10 +609,6 @@ 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);