diff options
Diffstat (limited to 'patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch')
| -rw-r--r-- | patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch new file mode 100644 index 0000000000..910c13ba80 --- /dev/null +++ b/patches/server/0734-don-t-attempt-to-teleport-dead-entities.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: sulu5890 <[email protected]> +Date: Sun, 24 Oct 2021 22:48:14 -0500 +Subject: [PATCH] don't attempt to teleport dead entities + + +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index 87d5b7a3d9cb406c37982419be4d112051946deb..a648b174ba00ba2e23cbbbd34fd397f295a06390 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -787,7 +787,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { + // CraftBukkit start + public void postTick() { + // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle +- if (!(this instanceof ServerPlayer)) { ++ if (!(this instanceof ServerPlayer) && this.isAlive()) { // Paper - don't attempt to teleport dead entities + this.handleNetherPortal(); + } + } |