1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0831-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0831-Forward-CraftEntity-in-teleport-command.patch
new file mode 100644
index 0000000000..e8e89b6b09
--- /dev/null
+++ b/patches/server/0831-Forward-CraftEntity-in-teleport-command.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sat, 4 Dec 2021 17:04:47 -0800
+Subject: [PATCH] Forward CraftEntity in teleport command
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index 9bb44918af119d9afae4a0a050c6a5381f028364..8ea81f6ac7503c68f0aea34802843bc545f46db0 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -3154,6 +3154,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+     }
+ 
+     public void restoreFrom(Entity original) {
++        // Paper start
++        CraftEntity bukkitEntity = original.bukkitEntity;
++        if (bukkitEntity != null) {
++            bukkitEntity.setHandle(this);
++            this.bukkitEntity = bukkitEntity;
++        }
++        // Paper end
+         CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
+ 
+         nbttagcompound.remove("Dimension");
+@@ -3231,10 +3238,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+                     if (worldserver.getTypeKey() == LevelStem.END) { // CraftBukkit
+                         ServerLevel.makeObsidianPlatform(worldserver, this); // CraftBukkit
+                     }
+-                    // CraftBukkit start - Forward the CraftEntity to the new entity
+-                    this.getBukkitEntity().setHandle(entity);
+-                    entity.bukkitEntity = this.getBukkitEntity();
+-                    // CraftBukkit end
++                    // // CraftBukkit start - Forward the CraftEntity to the new entity // Paper - moved to Entity#restoreFrom
++                    // this.getBukkitEntity().setHandle(entity);
++                    // entity.bukkitEntity = this.getBukkitEntity();
++                    // // CraftBukkit end
+                 }
+ 
+                 this.removeAfterChangingDimensions();