From 0576395ddd66d5c197fa9667885c238de92f4566 Mon Sep 17 00:00:00 2001
From: feildmaster <admin@feildmaster.com>
Date: Tue, 29 Jan 2013 09:36:56 -0600
Subject: When leaving the end, always target the main world. Fixes BUKKIT-3517

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

(limited to 'src')

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);
-- 
cgit v1.2.3