aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0827-Forward-CraftEntity-in-teleport-command.patch')
-rw-r--r--patches/server/0827-Forward-CraftEntity-in-teleport-command.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0827-Forward-CraftEntity-in-teleport-command.patch
new file mode 100644
index 0000000000..9eec59ce99
--- /dev/null
+++ b/patches/server/0827-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 98a8a00d55f87fb210fa6d3825a7ff476f601021..27eb30d02d08ff61fb9916961d99e4ce01341290 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -3203,6 +3203,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");
+@@ -3284,10 +3291,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();