40 Zeilen
2.0 KiB
Diff
40 Zeilen
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
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 c5d652b24c5442e1f566e7f1fe71748f0d406f86..e3243ee624861771fb6b7c39a91ad33f827eebaa 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -3285,6 +3285,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
}
|
|
|
|
public void restoreFrom(Entity original) {
|
|
+ // Paper start - Forward CraftEntity in teleport command
|
|
+ CraftEntity bukkitEntity = original.bukkitEntity;
|
|
+ if (bukkitEntity != null) {
|
|
+ bukkitEntity.setHandle(this);
|
|
+ this.bukkitEntity = bukkitEntity;
|
|
+ }
|
|
+ // Paper end - Forward CraftEntity in teleport command
|
|
CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
|
|
|
|
nbttagcompound.remove("Dimension");
|
|
@@ -3375,10 +3382,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
}
|
|
}
|
|
// CraftBukkit end
|
|
- // 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 - Forward CraftEntity in teleport command; moved to Entity#restoreFrom
|
|
+ // this.getBukkitEntity().setHandle(entity);
|
|
+ // entity.bukkitEntity = this.getBukkitEntity();
|
|
+ // // CraftBukkit end
|
|
}
|
|
|
|
this.removeAfterChangingDimensions();
|