From ac3725a24b551ebfd777df223f1e625f8b683dc3 Mon Sep 17 00:00:00 2001 From: Robotia Date: Mon, 1 Feb 2016 19:36:42 -0500 Subject: [PATCH] Revert KC TeleportCause.DEATH --- .../management/ServerConfigurationManager.java.patch | 8 ++++---- .../java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch b/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch index 999dc0b..8278b12 100644 --- a/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch +++ b/patches/net/minecraft/server/management/ServerConfigurationManager.java.patch @@ -443,10 +443,10 @@ + // Cauldron start - refactor entire method for sanity. + public EntityPlayerMP respawnPlayer(EntityPlayerMP par1EntityPlayerMP, int par2, boolean par3) + { -+ return this.respawnPlayer(par1EntityPlayerMP, par2, par3, null, TeleportCause.DEATH); ++ return this.respawnPlayer(par1EntityPlayerMP, par2, par3, null); + } + -+ public EntityPlayerMP respawnPlayer(EntityPlayerMP par1EntityPlayerMP, int targetDimension, boolean returnFromEnd, Location location, TeleportCause cause) ++ public EntityPlayerMP respawnPlayer(EntityPlayerMP par1EntityPlayerMP, int targetDimension, boolean returnFromEnd, Location location) + { + // Phase 1 - check if the player is allowed to respawn in same dimension + World world = mcServer.worldServerForDimension(targetDimension); @@ -504,7 +504,7 @@ + par1EntityPlayerMP.dimension = targetDimension; + // CraftBukkit start + EntityPlayerMP entityplayermp1 = par1EntityPlayerMP; -+ entityplayermp1.clonePlayer(par1EntityPlayerMP, cause != TeleportCause.DEATH); // KCauldron - clone player ++ entityplayermp1.clonePlayer(par1EntityPlayerMP, returnFromEnd); // KCauldron - clone player + entityplayermp1.setWorld(this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension)); // make sure to update reference for bed spawn logic + entityplayermp1.playerConqueredTheEnd = false; ChunkCoordinates chunkcoordinates1; @@ -619,9 +619,9 @@ + // If world changed then fire the appropriate change world event else respawn + if (fromWorld != location.getWorld()) + { -+ FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1); + FMLCommonHandler.instance().firePlayerChangedDimensionEvent(entityplayermp1, ((CraftWorld) fromWorld).getHandle().provider.dimensionId, + ((CraftWorld) location.getWorld()).getHandle().provider.dimensionId, (CraftWorld) fromWorld); // Cauldron - fire forge changed dimension event ++ FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1); + } + else + FMLCommonHandler.instance().firePlayerRespawnEvent(entityplayermp1); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 4bbfbd8..a891039 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -503,7 +503,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { if (fromWorld == toWorld) { entity.playerNetServerHandler.teleport(to); } else { - server.getHandle().respawnPlayer(entity, toWorld.dimension, false, to, cause); // Cauldron + server.getHandle().respawnPlayer(entity, toWorld.dimension, false, to); // Cauldron } return true; }