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/0323-Add-option-to-nerf-pigmen-from-nether-portals.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/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch')
| -rw-r--r-- | patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch index 515c726562..f12aca294a 100644 --- a/patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/patches/server/0323-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 5bb379251c5af88d4350bd2715147e6442d695fd..f75457a5297fc041de5f2d7eabcc072201a42a09 100644 +index a80041ccb308fa393498e72c1060f89ade440cb8..70fdacb0aab225b89126d9c21e14cf42d69f00fa 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java -@@ -399,6 +399,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -398,6 +398,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess public void inactiveTick() { } // Spigot end protected int numCollisions = 0; // Paper - Cap entity collisions @@ -16,7 +16,7 @@ index 5bb379251c5af88d4350bd2715147e6442d695fd..f75457a5297fc041de5f2d7eabcc0722 public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one // Paper start - Entity origin API @javax.annotation.Nullable -@@ -2214,6 +2215,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2213,6 +2214,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess if (spawnedViaMobSpawner) { nbttagcompound.putBoolean("Paper.FromMobSpawner", true); } @@ -26,7 +26,7 @@ index 5bb379251c5af88d4350bd2715147e6442d695fd..f75457a5297fc041de5f2d7eabcc0722 // Paper end return nbttagcompound; } catch (Throwable throwable) { -@@ -2356,6 +2360,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess +@@ -2355,6 +2359,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess } spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status |