From d36ac82c839cec0955e61891a271d12e91e2fa0d Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Fri, 9 Dec 2011 17:09:21 +0000
Subject: Fixed NPE in ServerConfigurationManager when sometimes attempting to
 flee the End

---
 src/main/java/net/minecraft/server/ServerConfigurationManager.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index 80013324..9c29487c 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);
+                }
             }
         }
 
-- 
cgit v1.2.3