aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0631-don-t-attempt-to-teleport-dead-entities.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0631-don-t-attempt-to-teleport-dead-entities.patch')
-rw-r--r--patches/server/0631-don-t-attempt-to-teleport-dead-entities.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0631-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0631-don-t-attempt-to-teleport-dead-entities.patch
new file mode 100644
index 0000000000..c207194634
--- /dev/null
+++ b/patches/server/0631-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 42afa622c97cc7da666cfb3019f417c96842d318..4ec6a43b7f16560de948974d60ad8ab1dcbb4696 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -706,7 +706,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+ // 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.handlePortal();
+ }
+ }