From ad92e67256d8bb22fd12036a8f2915896446058b Mon Sep 17 00:00:00 2001 From: Evenprime Date: Sat, 10 Sep 2011 18:53:16 +0200 Subject: [PATCH] Fix (harmless) NPE in case of portal usage with disabled nether. --- .../nocheat/events/PlayerTeleportEventManager.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cc/co/evenprime/bukkit/nocheat/events/PlayerTeleportEventManager.java b/src/cc/co/evenprime/bukkit/nocheat/events/PlayerTeleportEventManager.java index 72ec19a8..061207d5 100644 --- a/src/cc/co/evenprime/bukkit/nocheat/events/PlayerTeleportEventManager.java +++ b/src/cc/co/evenprime/bukkit/nocheat/events/PlayerTeleportEventManager.java @@ -81,9 +81,13 @@ public class PlayerTeleportEventManager extends PlayerListener { data.morePacketsCounter = 0; data.morePacketsSetbackPoint = null; data.jumpPhase = 0; + + if(newLocation != null) { - data.noclipX = newLocation.getBlockX(); - data.noclipY = Location.locToBlock(newLocation.getY()+1.1D); - data.noclipZ = newLocation.getBlockZ(); + data.noclipX = newLocation.getBlockX(); + data.noclipY = Location.locToBlock(newLocation.getY()+1.1D); + data.noclipZ = newLocation.getBlockZ(); + + } } }