diff options
| author | Nassim Jahnke <[email protected]> | 2024-10-30 19:24:25 +0100 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-10-30 19:24:25 +0100 |
| commit | 4d2672e1ac157519f921fb0421100aa9ab4856de (patch) | |
| tree | 6b496844a9699f28262fb1c644d092c444b9765e | |
| parent | 7f7bc17f32c248b1e80e107fcb325ee203354533 (diff) | |
| download | Paper-4d2672e1ac157519f921fb0421100aa9ab4856de.tar.gz Paper-4d2672e1ac157519f921fb0421100aa9ab4856de.zip | |
Fix the fix
| -rw-r--r-- | patches/server/0305-Fix-items-not-falling-correctly.patch | 13 | ||||
| -rw-r--r-- | patches/server/0990-Entity-Activation-Range-2.0.patch | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/patches/server/0305-Fix-items-not-falling-correctly.patch b/patches/server/0305-Fix-items-not-falling-correctly.patch index 130affd473..0ce79d8385 100644 --- a/patches/server/0305-Fix-items-not-falling-correctly.patch +++ b/patches/server/0305-Fix-items-not-falling-correctly.patch @@ -28,17 +28,20 @@ index f9dfd6e7b610cfee75524a525ab0e72bed5522da..e110296a95441a13ec431d897796326b float f = 0.98F; diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 6d51464f6368151e8acc532414ee223714584e96..bd3682f2193b6febcd0cbf7d2d9f34c0f9ac2670 100644 +index 6d51464f6368151e8acc532414ee223714584e96..00242230e327fb9dd99109398aa7c013bea8af8d 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java -@@ -256,10 +256,10 @@ public class ActivationRange +@@ -254,12 +254,11 @@ public class ActivationRange + entity.activatedTick = MinecraftServer.currentTick + 20; + } isActive = true; ++ } else if (entity instanceof net.minecraft.world.entity.item.ItemEntity && (entity.tickCount + 1 + entity.getId()) % 4 == 0) { // Paper - Needed for item gravity, see ItemEntity tick. +1 since the entity tick counter is increased AFTER... ++ isActive = true; } - // Add a little performance juice to active entities. Skip 1/4 if not immune. +- // Add a little performance juice to active entities. Skip 1/4 if not immune. - } else if ( !entity.defaultActivationState && entity.tickCount % 4 == 0 && !ActivationRange.checkEntityImmunities( entity ) ) - { -+ } else if (entity instanceof net.minecraft.world.entity.item.ItemEntity && (entity.tickCount + 1 + entity.getId()) % 4 == 0) { // Paper - Needed for item gravity, see ItemEntity tick. +1 since the entity tick counter is increased AFTER... - isActive = false; +- isActive = false; } + // Paper - remove dumb active tick skipping return isActive; diff --git a/patches/server/0990-Entity-Activation-Range-2.0.patch b/patches/server/0990-Entity-Activation-Range-2.0.patch index 0e635b2cda..3006ad7465 100644 --- a/patches/server/0990-Entity-Activation-Range-2.0.patch +++ b/patches/server/0990-Entity-Activation-Range-2.0.patch @@ -373,7 +373,7 @@ index d7b963571c900f0f68005d6954bcd9ef1d9e0b7c..b35f476e26a020cf75e53a5eb488717d } } diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index bd3682f2193b6febcd0cbf7d2d9f34c0f9ac2670..b2c1e686a312b03865ed980c0500687d036317e8 100644 +index 00242230e327fb9dd99109398aa7c013bea8af8d..c7efdd1483b309ed8121e2203216ab288daa3117 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -1,33 +1,43 @@ @@ -738,8 +738,8 @@ index bd3682f2193b6febcd0cbf7d2d9f34c0f9ac2670..b2c1e686a312b03865ed980c0500687d } + // Paper end isActive = true; - } - // Add a little performance juice to active entities. Skip 1/4 if not immune. + } else if (entity instanceof net.minecraft.world.entity.item.ItemEntity && (entity.tickCount + 1 + entity.getId()) % 4 == 0) { // Paper - Needed for item gravity, see ItemEntity tick. +1 since the entity tick counter is increased AFTER... + isActive = true; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java index 2b263246135c85aa225120519e9702a628773935..2c408fa4abcbe1171c58aee8799c8cf7867d0f0a 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java |