From 15dd8f06928bde3d883266889c80a57341407a60 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:56:09 -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. --- .../0105-Don-t-teleport-dead-entities.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Spigot-Server-Patches/0105-Don-t-teleport-dead-entities.patch diff --git a/Spigot-Server-Patches/0105-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0105-Don-t-teleport-dead-entities.patch new file mode 100644 index 000000000..ece578941 --- /dev/null +++ b/Spigot-Server-Patches/0105-Don-t-teleport-dead-entities.patch @@ -0,0 +1,24 @@ +From c1462e2b3643606950a1a9b417a83312fbd0aac7 Mon Sep 17 00:00:00 2001 +From: Aikar +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 0f66b39..e57195c 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -2096,7 +2096,7 @@ public abstract class Entity implements ICommandListener { + } + + 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(); + int i = worldserver1.dimension; +-- +2.7.4 +