diff options
| author | Jake Potrebic <[email protected]> | 2024-05-26 12:51:15 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-26 12:51:15 -0700 |
| commit | 9774a52d110f29e4be956d1aad7bb4c99b50d21d (patch) | |
| tree | 87b4d46a37670e8fadfae8bc4924fcf633616457 /patches/server/0597-Add-back-EntityPortalExitEvent.patch | |
| parent | ca50b87947e0aca6017a7d4b242d892b930ae2c2 (diff) | |
| download | Paper-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/0597-Add-back-EntityPortalExitEvent.patch')
| -rw-r--r-- | patches/server/0597-Add-back-EntityPortalExitEvent.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0597-Add-back-EntityPortalExitEvent.patch b/patches/server/0597-Add-back-EntityPortalExitEvent.patch index 6d23ae47de..5a83bce11c 100644 --- a/patches/server/0597-Add-back-EntityPortalExitEvent.patch +++ b/patches/server/0597-Add-back-EntityPortalExitEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add back EntityPortalExitEvent diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index b92aba1a77bc8139f28232b96f1a126eef7852a4..74c5f418ea6b5861d8e5d4ced17b5a8772d6dcde 100644 +index 325d8551d4f6c1d24525fab607769a75320cf436..2d98bdae7e8686d8a15e8938a16d8d63f0575bef 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -3313,6 +3313,28 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3312,6 +3312,28 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } else { // CraftBukkit start worldserver = shapedetectorshape.world; @@ -37,7 +37,7 @@ index b92aba1a77bc8139f28232b96f1a126eef7852a4..74c5f418ea6b5861d8e5d4ced17b5a87 if (worldserver == this.level) { // SPIGOT-6782: Just move the entity if a plugin changed the world to the one the entity is already in this.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, shapedetectorshape.xRot); -@@ -3332,8 +3354,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -3331,8 +3353,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess if (entity != null) { entity.restoreFrom(this); |