From 249ba1248d2d6cc12a3366eb7871fd96c40303a3 Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 12 Mar 2012 12:19:20 -0700 Subject: [PATCH] Custom dimensions should now honor the canRespawnHere function for respawning. --- .../minecraft/src/NetServerHandler.java.patch | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch b/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch index 8bd2004261..e31cc46071 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch @@ -34,7 +34,28 @@ { this.playerEntity.itemInWorldManager.activeBlockOrUseItem(this.playerEntity, var2, var3, var5, var6, var7, var8); } -@@ -954,4 +960,49 @@ +@@ -761,9 +767,10 @@ + */ + public void handleRespawn(Packet9Respawn par1Packet9Respawn) + { ++ int dim = (this.mcServer.getWorldManager(this.playerEntity.dimension).worldProvider.canRespawnHere() ? this.playerEntity.dimension : 0); + if (this.playerEntity.gameOver) + { +- this.playerEntity = this.mcServer.configManager.recreatePlayerEntity(this.playerEntity, 0, true); ++ this.playerEntity = this.mcServer.configManager.recreatePlayerEntity(this.playerEntity, dim, true); + } + else + { +@@ -772,7 +779,7 @@ + return; + } + +- this.playerEntity = this.mcServer.configManager.recreatePlayerEntity(this.playerEntity, 0, false); ++ this.playerEntity = this.mcServer.configManager.recreatePlayerEntity(this.playerEntity, dim, false); + } + } + +@@ -954,4 +961,49 @@ { return true; }