diff options
| author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-12-09 17:09:21 +0000 |
|---|---|---|
| committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-12-09 17:09:21 +0000 |
| commit | d36ac82c839cec0955e61891a271d12e91e2fa0d (patch) | |
| tree | e3f4e38d6a31bee35114b5e02a28300997b9279d /src | |
| parent | 5e43c61fad9c6620b20518b120ac0448387f2ee5 (diff) | |
| download | craftbukkit-d36ac82c839cec0955e61891a271d12e91e2fa0d.tar craftbukkit-d36ac82c839cec0955e61891a271d12e91e2fa0d.tar.gz craftbukkit-d36ac82c839cec0955e61891a271d12e91e2fa0d.tar.lz craftbukkit-d36ac82c839cec0955e61891a271d12e91e2fa0d.tar.xz craftbukkit-d36ac82c839cec0955e61891a271d12e91e2fa0d.zip | |
Fixed NPE in ServerConfigurationManager when sometimes attempting to flee the End
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/ServerConfigurationManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
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); + } } } |