diff --git a/sp-server/src/main/java/net/minecraft/src/ServerConfigurationManager.java b/sp-server/src/main/java/net/minecraft/src/ServerConfigurationManager.java
index 3e2ed85..9c9cb5f 100644
--- a/sp-server/src/main/java/net/minecraft/src/ServerConfigurationManager.java
+++ b/sp-server/src/main/java/net/minecraft/src/ServerConfigurationManager.java
@@ -307,11 +307,11 @@ public class ServerConfigurationManager {
 		// footnotes of packet Respawn (0x09)
 		par1EntityPlayerMP.playerNetServerHandler.sendPacket(new Packet9Respawn(((par1EntityPlayerMP.dimension + 2) % 3) - 1,
 				(byte) par1EntityPlayerMP.worldObj.difficultySetting, par1EntityPlayerMP.worldObj.getWorldInfo().getTerrainType(),
-				par1EntityPlayerMP.worldObj.getHeight(), par1EntityPlayerMP.theItemInWorldManager.getGameType()));
+				69, par1EntityPlayerMP.theItemInWorldManager.getGameType()));
 		par1EntityPlayerMP.playerNetServerHandler.setPlayerLocation(posX, posY, posZ, rotationYaw, rotationPitch);
 		par1EntityPlayerMP.playerNetServerHandler.sendPacket(new Packet9Respawn(par1EntityPlayerMP.dimension,
 				(byte) par1EntityPlayerMP.worldObj.difficultySetting, par1EntityPlayerMP.worldObj.getWorldInfo().getTerrainType(),
-				par1EntityPlayerMP.worldObj.getHeight(), par1EntityPlayerMP.theItemInWorldManager.getGameType()));
+				69, par1EntityPlayerMP.theItemInWorldManager.getGameType()));
 		par1EntityPlayerMP.playerNetServerHandler.setPlayerLocation(posX, posY, posZ, rotationYaw, rotationPitch);
 
 		this.updateTimeAndWeatherForPlayer(par1EntityPlayerMP, var8);
diff --git a/src/main/java/net/minecraft/src/NetClientHandler.java b/src/main/java/net/minecraft/src/NetClientHandler.java
index 7d815d8..ab209a5 100644
--- a/src/main/java/net/minecraft/src/NetClientHandler.java
+++ b/src/main/java/net/minecraft/src/NetClientHandler.java
@@ -725,7 +725,7 @@ public class NetClientHandler extends NetHandler {
 			this.worldClient.isRemote = true;
 			this.mc.loadWorld(this.worldClient);
 			this.mc.thePlayer.dimension = par1Packet9Respawn.respawnDimension;
-			this.mc.displayGuiScreen(new GuiDownloadTerrain(this));
+			if (par1Packet9Respawn.worldHeight != 69) this.mc.displayGuiScreen(new GuiDownloadTerrain(this));
 		}
 
 		this.mc.setDimensionAndSpawnPlayer(par1Packet9Respawn.respawnDimension);