PaperMC/Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch

From 6af064d807377a45c74cb75e73e28d775d252e27 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 22 Mar 2016 00:55:23 -0400
Subject: [PATCH] Don't teleport dead entities

Had some issue with this in past, and this is the vanilla logic.
Potentially an old CB change that's no longer needed.

diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index e31c97fb72..7275c4d21a 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2562,7 +2562,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
     }
 
     public Entity teleportTo(Location exit, boolean portal) {
-        if (true) {
+        if (!this.dead) { // Paper
             WorldServer worldserver = ((CraftWorld) getBukkitEntity().getLocation().getWorld()).getHandle();
             WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
             DimensionManager dimensionmanager = worldserver1.dimension;
-- 
2.19.0
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes: 1cf8b5dc SPIGOT-4400: Populators running on existing chunks 116cb9a1 SPIGOT-4399: Add attribute modifier equality test 5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag 2018-09-29 01:31:59 +02:00			`From 6af064d807377a45c74cb75e73e28d775d252e27 Mon Sep 17 00:00:00 2001`
Don't teleport dead entities Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. 2016-03-22 05:56:09 +01:00			`From: Aikar <aikar@aikar.co>`
			`Date: Tue, 22 Mar 2016 00:55:23 -0400`
			`Subject: [PATCH] Don't teleport dead entities`

			`Had some issue with this in past, and this is the vanilla logic.`
			`Potentially an old CB change that's no longer needed.`

			`diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has been tested to ensure that World Conversion still occurs correctly. Bukkit Changes: 0812ce2c SPIGOT-4397: isChunkGenerated API CraftBukkit Changes: 4824655c SPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 support eea43870 MC-134115: Fix issues converting tile entities 1a7f2d10 SPIGOT-4397: isChunkGenerated API 40aed54d SPIGOT-4396: Improve vehicle movement Spigot Changes: f6a273b1 Rebuild patches 2018-09-27 04:35:42 +02:00			`index e31c97fb72..7275c4d21a 100644`
Don't teleport dead entities Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. 2016-03-22 05:56:09 +01:00			`--- a/src/main/java/net/minecraft/server/Entity.java`
			`+++ b/src/main/java/net/minecraft/server/Entity.java`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has been tested to ensure that World Conversion still occurs correctly. Bukkit Changes: 0812ce2c SPIGOT-4397: isChunkGenerated API CraftBukkit Changes: 4824655c SPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 support eea43870 MC-134115: Fix issues converting tile entities 1a7f2d10 SPIGOT-4397: isChunkGenerated API 40aed54d SPIGOT-4396: Improve vehicle movement Spigot Changes: f6a273b1 Rebuild patches 2018-09-27 04:35:42 +02:00			`@@ -2562,7 +2562,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke`
Don't teleport dead entities Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. 2016-03-22 05:56:09 +01:00			`}`

			`public Entity teleportTo(Location exit, boolean portal) {`
			`- if (true) {`
			`+ if (!this.dead) { // Paper`
			`WorldServer worldserver = ((CraftWorld) getBukkitEntity().getLocation().getWorld()).getHandle();`
			`WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();`
Paper 1.13.1 Update Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1 2018-08-26 20:11:49 +02:00			`DimensionManager dimensionmanager = worldserver1.dimension;`
Don't teleport dead entities Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. 2016-03-22 05:56:09 +01:00			`--`
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has been tested to ensure that World Conversion still occurs correctly. Bukkit Changes: 0812ce2c SPIGOT-4397: isChunkGenerated API CraftBukkit Changes: 4824655c SPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 support eea43870 MC-134115: Fix issues converting tile entities 1a7f2d10 SPIGOT-4397: isChunkGenerated API 40aed54d SPIGOT-4396: Improve vehicle movement Spigot Changes: f6a273b1 Rebuild patches 2018-09-27 04:35:42 +02:00			`2.19.0`
Don't teleport dead entities Had some issue with this in past, and this is the vanilla logic. Potentially an old CB change that's no longer needed. 2016-03-22 05:56:09 +01:00