KC Official Fix (07698c433a)

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);
++       return this.respawnPlayer(par1EntityPlayerMP, par2, par3, null, TeleportCause.DEATH);
 +    }
 +
-+    public EntityPlayerMP respawnPlayer(EntityPlayerMP par1EntityPlayerMP, int targetDimension, boolean returnFromEnd, Location location)
++    public EntityPlayerMP respawnPlayer(EntityPlayerMP par1EntityPlayerMP, int targetDimension, boolean returnFromEnd, Location location, TeleportCause cause)
 +    {
 +        // 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, returnFromEnd); // KCauldron - clone player
++        entityplayermp1.clonePlayer(par1EntityPlayerMP, cause != TeleportCause.DEATH); // KCauldron - clone player
 +        entityplayermp1.setWorld(this.mcServer.worldServerForDimension(par1EntityPlayerMP.dimension)); // make sure to update reference for bed spawn logic
 +        entityplayermp1.playerConqueredTheEnd = false;
          ChunkCoordinates chunkcoordinates1;

patches/org/bukkit/event/player/PlayerTeleportEvent.java.patch

@@ -1,17 +1,18 @@
 --- ../src-base/minecraft/org/bukkit/event/player/PlayerTeleportEvent.java
 +++ ../src-work/minecraft/org/bukkit/event/player/PlayerTeleportEvent.java
-@@ -55,11 +55,27 @@
+@@ -55,11 +55,28 @@
           * portal
           */
          END_PORTAL,
 +        // Cauldron start - added cause for mods
-         /**
++        /**
 +         * Indicates the teleportation was caused by a player entering a
 +         * Mod portal
 +         */
 +        MOD,
 +        // Cauldron end
-+        /**
++        DEATH, // KCauldron
+         /**
           * Indicates the teleportation was caused by an event not covered by
           * this enum
           */
@@ -28,3 +29,9 @@
      }
  
      @Override
+@@ -70,4 +87,4 @@
+     public static HandlerList getHandlerList() {
+         return handlers;
+     }
+-}
++}

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); // Cauldron
+            server.getHandle().respawnPlayer(entity, toWorld.dimension, false, to, cause); // Cauldron
         }
         return true;
     }
@@ -1340,4 +1340,4 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         return spigot;
     }
     // Spigot end
-}
+}