keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Custom dimensions should now honor the canRespawnHere function for respawning.

Browse source
This commit is contained in:
LexManos 2012-03-12 12:19:20 -07:00
parent 02b3c0042d
commit 249ba1248d
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
forge/patches/minecraft_server/net/minecraft/src/NetServerHandler.java.patch
View file

@ -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;
}