diff options
| author | feildmaster <admin@feildmaster.com> | 2013-01-29 09:36:56 -0600 |
|---|---|---|
| committer | feildmaster <admin@feildmaster.com> | 2013-01-29 09:48:52 -0600 |
| commit | 0576395ddd66d5c197fa9667885c238de92f4566 (patch) | |
| tree | d4748d03080c521438ebdaa8d1d778aac66f10e5 /src/main/java/net/minecraft/server/PlayerList.java | |
| parent | b0e43c809739d3521d7cd5e54bb5259886c50fb7 (diff) | |
| download | craftbukkit-0576395ddd66d5c197fa9667885c238de92f4566.tar craftbukkit-0576395ddd66d5c197fa9667885c238de92f4566.tar.gz craftbukkit-0576395ddd66d5c197fa9667885c238de92f4566.tar.lz craftbukkit-0576395ddd66d5c197fa9667885c238de92f4566.tar.xz craftbukkit-0576395ddd66d5c197fa9667885c238de92f4566.zip | |
When leaving the end, always target the main world. Fixes BUKKIT-3517
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerList.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/PlayerList.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java index 12f5d621..e9f6a6bd 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -441,7 +441,9 @@ public abstract class PlayerList { if ((cause == TeleportCause.END_PORTAL) && (i == 0)) { // THE_END -> NORMAL; use bed if available, otherwise default spawn exit = ((CraftPlayer) entityplayer.getBukkitEntity()).getBedSpawnLocation(); - if (exit == null) exit = exitWorld.getWorld().getSpawnLocation(); + if (exit == null || ((CraftWorld) exit.getWorld()).getHandle().dimension != 0) { + exit = exitWorld.getWorld().getSpawnLocation(); + } } else { // NORMAL <-> NETHER or NORMAL -> THE_END exit = this.calculateTarget(enter, exitWorld); |