From d36ac82c839cec0955e61891a271d12e91e2fa0d Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Fri, 9 Dec 2011 17:09:21 +0000 Subject: [PATCH] Fixed NPE in ServerConfigurationManager when sometimes attempting to flee the End --- .../java/net/minecraft/server/ServerConfigurationManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 80013324d4..9c29487c87 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -321,7 +321,9 @@ public class ServerConfigurationManager { toLocation = toWorld == null ? null : new Location(toWorld.getWorld(), (entityplayer.locX * blockRatio), entityplayer.locY, (entityplayer.locZ * blockRatio), entityplayer.yaw, entityplayer.pitch); } else { ChunkCoordinates coords = toWorld.d(); - toLocation = new Location(toWorld.getWorld(), coords.x, coords.y, coords.z, 90, 0); + if (coords != null) { + toLocation = new Location(toWorld.getWorld(), coords.x, coords.y, coords.z, 90, 0); + } } }