aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-05-26 12:51:15 -0700
committerGitHub <[email protected]>2024-05-26 12:51:15 -0700
commit9774a52d110f29e4be956d1aad7bb4c99b50d21d (patch)
tree87b4d46a37670e8fadfae8bc4924fcf633616457 /patches/server/0652-Forward-CraftEntity-in-teleport-command.patch
parentca50b87947e0aca6017a7d4b242d892b930ae2c2 (diff)
downloadPaper-9774a52d110f29e4be956d1aad7bb4c99b50d21d.tar.gz
Paper-9774a52d110f29e4be956d1aad7bb4c99b50d21d.zip
fix and cleanup loot table patches (#10100)
* fix and cleanup loot table patches * fixes
Diffstat (limited to 'patches/server/0652-Forward-CraftEntity-in-teleport-command.patch')
-rw-r--r--patches/server/0652-Forward-CraftEntity-in-teleport-command.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch
index e47b0ba0d3..c07753356e 100644
--- a/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch
+++ b/patches/server/0652-Forward-CraftEntity-in-teleport-command.patch
@@ -5,10 +5,10 @@ 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
+index 50aca89516dea3f4c4d668b994f4afdea69b4cc9..af1b161e5e61fe244b316d352452038c9b4ea458 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
+@@ -3284,6 +3284,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
public void restoreFrom(Entity original) {
@@ -22,7 +22,7 @@ index c5d652b24c5442e1f566e7f1fe71748f0d406f86..e3243ee624861771fb6b7c39a91ad33f
CompoundTag nbttagcompound = original.saveWithoutId(new CompoundTag());
nbttagcompound.remove("Dimension");
-@@ -3375,10 +3382,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3374,10 +3381,10 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
}
}
// CraftBukkit end