Several fixes and new api for experience merging/stacking (#9242)

1 files changed, 19 insertions, 0 deletions

diff --git a/patches/server/0640-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0640-don-t-attempt-to-teleport-dead-entities.patch
new file mode 100644
index 0000000000..1ea681b348
--- /dev/null
+++ b/patches/server/0640-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 df7741ca931d7d1eb1b0cbdcc2b2bb15875c750c..50aca89516dea3f4c4d668b994f4afdea69b4cc9 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -730,7 +730,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.handleNetherPortal();
+         }
+     }