c6ea84c7fa
spigot no longer even fires the event for this case, so, this may actually be a regression, not too sure here, but, as-is this patch is dead
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 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();
|