diff options
| author | Lulu13022002 <[email protected]> | 2024-06-22 20:11:34 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-06-22 20:11:34 +0200 |
| commit | 76c2f16f577d2e5515482a8dcd3d97aeeec20e1e (patch) | |
| tree | 61f02d041e8f377590201ce24d665b2e791ae191 /patches/server/0282-Entity-getEntitySpawnReason.patch | |
| parent | 77c763b5ef5b33e8ce34866bf5ed3c94d43f298e (diff) | |
| download | Paper-76c2f16f577d2e5515482a8dcd3d97aeeec20e1e.tar.gz Paper-76c2f16f577d2e5515482a8dcd3d97aeeec20e1e.zip | |
Fix wrong diff applying delta twice (#10959)
Diffstat (limited to 'patches/server/0282-Entity-getEntitySpawnReason.patch')
| -rw-r--r-- | patches/server/0282-Entity-getEntitySpawnReason.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0282-Entity-getEntitySpawnReason.patch b/patches/server/0282-Entity-getEntitySpawnReason.patch index d3d1d0b939..52983d8beb 100644 --- a/patches/server/0282-Entity-getEntitySpawnReason.patch +++ b/patches/server/0282-Entity-getEntitySpawnReason.patch @@ -59,7 +59,7 @@ index 00c43d7b846e97e2cc2105c93be5ce918fafd775..8f90e8cd36348089799097807ead774e if (entity != null) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5b3de422b07f680e6639ee84f076bffb3c901d0e..631f2d70b5fd6dabc06062e3c77802d2b61398ae 100644 +index 2e376b0b2bf2d49ad0669b6e6fd287628a72ea64..869cd3723c6704e7512f4637682476b8af9f0264 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -247,6 +247,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -70,7 +70,7 @@ index 5b3de422b07f680e6639ee84f076bffb3c901d0e..631f2d70b5fd6dabc06062e3c77802d2 private CraftEntity bukkitEntity; -@@ -2276,6 +2277,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2275,6 +2276,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } nbttagcompound.put("Paper.Origin", this.newDoubleList(origin.getX(), origin.getY(), origin.getZ())); } @@ -80,7 +80,7 @@ index 5b3de422b07f680e6639ee84f076bffb3c901d0e..631f2d70b5fd6dabc06062e3c77802d2 // Save entity's from mob spawner status if (spawnedViaMobSpawner) { nbttagcompound.putBoolean("Paper.FromMobSpawner", true); -@@ -2422,6 +2426,26 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2421,6 +2425,26 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status |