fix mob spawning over limit

2025-12-19 15:09:25 +00:00 · 2025-06-25 23:03:59 +09:00
parent e076575844
commit a44c865ee6
70 changed files with 12 additions and 12 deletions
--- a/leaf-server/minecraft-patches/features/0209-Use-ensureCapacity-to-pre-populate-the-size-of-ticki.patch
+++ b/leaf-server/minecraft-patches/features/0209-Use-ensureCapacity-to-pre-populate-the-size-of-ticki.patch
--- a/leaf-server/minecraft-patches/features/0210-Directly-use-the-pre-filtered-ticking-chunks-list-as.patch
+++ b/leaf-server/minecraft-patches/features/0210-Directly-use-the-pre-filtered-ticking-chunks-list-as.patch
--- a/leaf-server/minecraft-patches/features/0209-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
+++ b/leaf-server/minecraft-patches/features/0209-Bulk-writes-to-writeLongArray-during-chunk-loading.patch
--- a/leaf-server/minecraft-patches/features/0210-Improve-sorting-in-SortedArraySet.patch
+++ b/leaf-server/minecraft-patches/features/0210-Improve-sorting-in-SortedArraySet.patch
--- a/leaf-server/minecraft-patches/features/0211-Make-removeIf-slightly-faster.patch
+++ b/leaf-server/minecraft-patches/features/0211-Make-removeIf-slightly-faster.patch
--- a/leaf-server/minecraft-patches/features/0212-Optimize-LinearPalette.patch
+++ b/leaf-server/minecraft-patches/features/0212-Optimize-LinearPalette.patch
--- a/leaf-server/minecraft-patches/features/0213-Slightly-optimized-VarInt-write.patch
+++ b/leaf-server/minecraft-patches/features/0213-Slightly-optimized-VarInt-write.patch
--- a/leaf-server/minecraft-patches/features/0214-Rewrite-ClientboundLightUpdatePacketData.patch
+++ b/leaf-server/minecraft-patches/features/0214-Rewrite-ClientboundLightUpdatePacketData.patch
--- a/leaf-server/minecraft-patches/features/0215-Async-chunk-send.patch
+++ b/leaf-server/minecraft-patches/features/0215-Async-chunk-send.patch
--- a/leaf-server/minecraft-patches/features/0216-Spawner-Configurations.patch
+++ b/leaf-server/minecraft-patches/features/0216-Spawner-Configurations.patch
--- a/leaf-server/minecraft-patches/features/0217-SparklyPaper-Parallel-world-ticking.patch
+++ b/leaf-server/minecraft-patches/features/0217-SparklyPaper-Parallel-world-ticking.patch
--- a/leaf-server/minecraft-patches/features/0218-SparklyPaper-Track-each-world-MSPT.patch
+++ b/leaf-server/minecraft-patches/features/0218-SparklyPaper-Track-each-world-MSPT.patch
--- a/leaf-server/minecraft-patches/features/0219-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
+++ b/leaf-server/minecraft-patches/features/0219-PaperPR-Fix-cancelled-Projectile-Events-still-consum.patch
@@ -230,7 +230,7 @@ index fb5077450aa9f7b7a03dd20c27a68dfdaab5ef06..f37fd3b9ab725e5b8eb7fccf9b35bbc0
                 player.getInventory().removeItem(ammo);
             }
 diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
-index c8219508cf94da71143b8672661592c66b341782..6278fe737a555f47625098828a03952cf9b859a7 100644
+index a1c2d2e5de4b992e62ff6d849a1e72a453a6e56e..f0bc659193184a87256616f501edce0094fadcfc 100644
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
@@ -171,6 +171,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
--- a/leaf-server/minecraft-patches/features/0220-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
+++ b/leaf-server/minecraft-patches/features/0220-Optimize-SetLookAndInteract-and-NearestVisibleLiving.patch
--- a/leaf-server/minecraft-patches/features/0221-Remove-streams-on-InsideBrownianWalk.patch
+++ b/leaf-server/minecraft-patches/features/0221-Remove-streams-on-InsideBrownianWalk.patch
--- a/leaf-server/minecraft-patches/features/0222-Use-BFS-on-getSlopeDistance.patch
+++ b/leaf-server/minecraft-patches/features/0222-Use-BFS-on-getSlopeDistance.patch
--- a/leaf-server/minecraft-patches/features/0223-Paper-PR-Throttle-failed-spawn-attempts.patch
+++ b/leaf-server/minecraft-patches/features/0223-Paper-PR-Throttle-failed-spawn-attempts.patch
--- a/leaf-server/minecraft-patches/features/0224-Improve-BlockEntity-ticking-isRemoved-check.patch
+++ b/leaf-server/minecraft-patches/features/0224-Improve-BlockEntity-ticking-isRemoved-check.patch
--- a/leaf-server/minecraft-patches/features/0225-Raytrace-AntiXray-SDK-integration.patch
+++ b/leaf-server/minecraft-patches/features/0225-Raytrace-AntiXray-SDK-integration.patch
--- a/leaf-server/minecraft-patches/features/0226-Optimize-addOrUpdateTransientModifier.patch
+++ b/leaf-server/minecraft-patches/features/0226-Optimize-addOrUpdateTransientModifier.patch
--- a/leaf-server/minecraft-patches/features/0227-Optimize-ContextMap.create.patch
+++ b/leaf-server/minecraft-patches/features/0227-Optimize-ContextMap.create.patch
--- a/leaf-server/minecraft-patches/features/0228-Micro-optimizations-for-random-tick.patch
+++ b/leaf-server/minecraft-patches/features/0228-Micro-optimizations-for-random-tick.patch
--- a/leaf-server/minecraft-patches/features/0229-Remove-streams-on-updateConnectedPlayersWithinRange.patch
+++ b/leaf-server/minecraft-patches/features/0229-Remove-streams-on-updateConnectedPlayersWithinRange.patch
--- a/leaf-server/minecraft-patches/features/0230-Remove-streams-on-PlayerDetector.patch
+++ b/leaf-server/minecraft-patches/features/0230-Remove-streams-on-PlayerDetector.patch
--- a/leaf-server/minecraft-patches/features/0231-Use-direct-iteration-on-Sensing.tick.patch
+++ b/leaf-server/minecraft-patches/features/0231-Use-direct-iteration-on-Sensing.tick.patch
--- a/leaf-server/minecraft-patches/features/0232-Optimise-non-flush-packet-sending.patch
+++ b/leaf-server/minecraft-patches/features/0232-Optimise-non-flush-packet-sending.patch
--- a/leaf-server/minecraft-patches/features/0233-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
+++ b/leaf-server/minecraft-patches/features/0233-Prevent-double-chunk-retrieving-in-entity-fluid-push.patch
@@ -11,7 +11,7 @@ As part of: Airplane (https://github.com/TECHNOVE/Airplane)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)

 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 602b0ce96cdc8ebd8d875f1dadfc2fdfe6aa0bad..13d0b21211e7d81fa57739854d3cc10ac03eff12 100644
+index 71b4d54814c815bc9e8fc6be820260180d0aa208..6500092b72d3bceacbfe8fef125e38d27bd176f7 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -4813,10 +4813,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/leaf-server/minecraft-patches/features/0234-Null-handling-on-MultifaceSpreader.patch
+++ b/leaf-server/minecraft-patches/features/0234-Null-handling-on-MultifaceSpreader.patch
--- a/leaf-server/minecraft-patches/features/0235-More-virtual-threads.patch
+++ b/leaf-server/minecraft-patches/features/0235-More-virtual-threads.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] More virtual threads


 diff --git a/net/minecraft/Util.java b/net/minecraft/Util.java
-index 9918572306e983281d05c6d28c8a5d843348ad2d..2491ca5bcabcf8ae99ef990eed4e1fd94f799991 100644
+index 82ee6c27ebc2718ad88b640775d949ec6d7cfed2..1f4208388a923f9a1667dc13d937955ac233d88e 100644
 --- a/net/minecraft/Util.java
 +++ b/net/minecraft/Util.java
@@ -98,7 +98,8 @@ public class Util {
--- a/leaf-server/minecraft-patches/features/0236-Async-target-finding.patch
+++ b/leaf-server/minecraft-patches/features/0236-Async-target-finding.patch
--- a/leaf-server/minecraft-patches/features/0237-Optimize-ThreadedTicketLevelPropagator.patch
+++ b/leaf-server/minecraft-patches/features/0237-Optimize-ThreadedTicketLevelPropagator.patch
--- a/leaf-server/minecraft-patches/features/0238-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
+++ b/leaf-server/minecraft-patches/features/0238-Optimise-MobEffectUtil-getDigSpeedAmplification.patch
--- a/leaf-server/minecraft-patches/features/0239-Optimise-chunkUnloads.patch
+++ b/leaf-server/minecraft-patches/features/0239-Optimise-chunkUnloads.patch
--- a/leaf-server/minecraft-patches/features/0240-Optimize-BlockEntityType-isValid.patch
+++ b/leaf-server/minecraft-patches/features/0240-Optimize-BlockEntityType-isValid.patch
@@ -33,7 +33,7 @@ index 386e6a48701b4c9256e33174123381a93d61e292..2bc620ceb8368e9a74b831de698de94a
 
     @Deprecated
 diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 3219b9caa654c7a64e5e4a92178528e1104b34c7..6d522e9485fadd6fc0f350cb30ba5224aa046d4f 100644
+index e8017f8ade048f02ec9adbabad9dcfd1ae9c6f93..3831010b2088da10eb48c81cac8ad05822409628 100644
 --- a/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
@@ -101,6 +101,7 @@ public abstract class BlockBehaviour implements FeatureElement {
--- a/leaf-server/minecraft-patches/features/0241-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch
+++ b/leaf-server/minecraft-patches/features/0241-PaperPR-Add-ticket-on-player-join-to-avoid-chunk-loa.patch
--- a/leaf-server/minecraft-patches/features/0242-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
+++ b/leaf-server/minecraft-patches/features/0242-Sakura-copy-EntityList-implementation-to-BasicEntity.patch
--- a/leaf-server/minecraft-patches/features/0243-Protocol-Core.patch
+++ b/leaf-server/minecraft-patches/features/0243-Protocol-Core.patch
--- a/leaf-server/minecraft-patches/features/0244-Reduce-PlayerChunk-Updates.patch
+++ b/leaf-server/minecraft-patches/features/0244-Reduce-PlayerChunk-Updates.patch
--- a/leaf-server/minecraft-patches/features/0245-Async-switch-connection-state.patch
+++ b/leaf-server/minecraft-patches/features/0245-Async-switch-connection-state.patch
--- a/leaf-server/minecraft-patches/features/0246-Optimize-BlockEntities-tickersInLevel.patch
+++ b/leaf-server/minecraft-patches/features/0246-Optimize-BlockEntities-tickersInLevel.patch
--- a/leaf-server/minecraft-patches/features/0247-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
+++ b/leaf-server/minecraft-patches/features/0247-Pluto-Check-if-the-cactus-can-even-survive-being-pla.patch
--- a/leaf-server/minecraft-patches/features/0248-Flush-location-while-knockback.patch
+++ b/leaf-server/minecraft-patches/features/0248-Flush-location-while-knockback.patch
--- a/leaf-server/minecraft-patches/features/0249-Only-tick-items-at-hand.patch
+++ b/leaf-server/minecraft-patches/features/0249-Only-tick-items-at-hand.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Only tick items at hand


 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index aef01105b827cc5959cc0d6611baf85bee311e5b..0de1a0def8901e1003ee41186fd3660ca8b19434 100644
+index e1695c06fe9a2ca8ad9050993c36201b36af6649..419a43bb1df71dfa9495f357d2655b30e0f79bef 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
@@ -848,12 +848,19 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
--- a/leaf-server/minecraft-patches/features/0250-Smart-sort-items-in-NearestItemSensor.patch
+++ b/leaf-server/minecraft-patches/features/0250-Smart-sort-items-in-NearestItemSensor.patch
--- a/leaf-server/minecraft-patches/features/0251-Optimise-player-movement-checks.patch
+++ b/leaf-server/minecraft-patches/features/0251-Optimise-player-movement-checks.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimise player movement checks


 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 13d0b21211e7d81fa57739854d3cc10ac03eff12..9ee4db861f66d1351e9a60cd4f41209002095b10 100644
+index 6500092b72d3bceacbfe8fef125e38d27bd176f7..2a1affd8b38ad3a2eb5861f03929619e3f2e3e4d 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -1216,7 +1216,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/leaf-server/minecraft-patches/features/0252-Remove-streams-in-MobSensor.patch
+++ b/leaf-server/minecraft-patches/features/0252-Remove-streams-in-MobSensor.patch
--- a/leaf-server/minecraft-patches/features/0253-Remove-streams-in-TemptingSensor.patch
+++ b/leaf-server/minecraft-patches/features/0253-Remove-streams-in-TemptingSensor.patch
--- a/leaf-server/minecraft-patches/features/0254-Use-HashedList-on-WeightedList.patch
+++ b/leaf-server/minecraft-patches/features/0254-Use-HashedList-on-WeightedList.patch
--- a/leaf-server/minecraft-patches/features/0255-Add-configurable-death-item-drop-knockback-settings.patch
+++ b/leaf-server/minecraft-patches/features/0255-Add-configurable-death-item-drop-knockback-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add configurable death item drop knockback settings


 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 0de1a0def8901e1003ee41186fd3660ca8b19434..b87c11ffbe450284c2ddc8760f287d64778a19d3 100644
+index 419a43bb1df71dfa9495f357d2655b30e0f79bef..678271bf808f09c85653cd5b14e792efd381ecf9 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
@@ -1067,7 +1067,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
--- a/leaf-server/minecraft-patches/features/0256-Optimize-getScaledTrackingDistance.patch
+++ b/leaf-server/minecraft-patches/features/0256-Optimize-getScaledTrackingDistance.patch
--- a/leaf-server/minecraft-patches/features/0257-Optimize-SynchedEntityData-packDirty.patch
+++ b/leaf-server/minecraft-patches/features/0257-Optimize-SynchedEntityData-packDirty.patch
--- a/leaf-server/minecraft-patches/features/0258-Optimize-isEyeInFluid.patch
+++ b/leaf-server/minecraft-patches/features/0258-Optimize-isEyeInFluid.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Optimize isEyeInFluid


 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 9ee4db861f66d1351e9a60cd4f41209002095b10..7573c566aace4b7661c5aed6d96653472bab81bb 100644
+index 2a1affd8b38ad3a2eb5861f03929619e3f2e3e4d..4dce68aafbccfeda82d0bee127a59f43502c6f70 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
@@ -289,6 +289,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
--- a/leaf-server/minecraft-patches/features/0259-Cache-block-path-type.patch
+++ b/leaf-server/minecraft-patches/features/0259-Cache-block-path-type.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache block path type


 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index d0429f38e3074560cb698b91b0d76967d1c2da20..6e3e5668213ccec7ed23b6fb8e082e1ca6f4d665 100644
+index 168fc4fea371dfe9ea1ffca3c9f290ba3547f0b9..463a9d9b15301e7139bd36435214662aa3ccf63d 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
@@ -366,6 +366,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -36,7 +36,7 @@ index 57aad048034005543a72556e990b53db8deebfee..6e6ee6f25f7cab0a6235d9e583ed5c01
 +    // Leaf end - Cache path type
 }
 diff --git a/net/minecraft/world/level/block/state/BlockBehaviour.java b/net/minecraft/world/level/block/state/BlockBehaviour.java
-index 6d522e9485fadd6fc0f350cb30ba5224aa046d4f..611887f5f8f218f5ec1ad19580f3123a60b20d46 100644
+index 3831010b2088da10eb48c81cac8ad05822409628..a898c9fef1d7dc9951966c75b726dfc7a15e59e9 100644
 --- a/net/minecraft/world/level/block/state/BlockBehaviour.java
 +++ b/net/minecraft/world/level/block/state/BlockBehaviour.java
@@ -473,6 +473,7 @@ public abstract class BlockBehaviour implements FeatureElement {
--- a/leaf-server/minecraft-patches/features/0260-optimize-getEntityStatus.patch
+++ b/leaf-server/minecraft-patches/features/0260-optimize-getEntityStatus.patch
--- a/leaf-server/minecraft-patches/features/0261-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
+++ b/leaf-server/minecraft-patches/features/0261-Rail-Optimization-optimized-PoweredRailBlock-logic.patch
--- a/leaf-server/minecraft-patches/features/0262-optimise-ChunkGenerator-getMobsAt.patch
+++ b/leaf-server/minecraft-patches/features/0262-optimise-ChunkGenerator-getMobsAt.patch
--- a/leaf-server/minecraft-patches/features/0263-optimise-getBiome.patch
+++ b/leaf-server/minecraft-patches/features/0263-optimise-getBiome.patch
--- a/leaf-server/minecraft-patches/features/0264-optimize-mob-spawning.patch
+++ b/leaf-server/minecraft-patches/features/0264-optimize-mob-spawning.patch
--- a/leaf-server/minecraft-patches/features/0265-optimize-structure-map.patch
+++ b/leaf-server/minecraft-patches/features/0265-optimize-structure-map.patch
--- a/leaf-server/minecraft-patches/features/0266-throttle-mob-spawning.patch
+++ b/leaf-server/minecraft-patches/features/0266-throttle-mob-spawning.patch
--- a/leaf-server/minecraft-patches/features/0267-Add-BlockExplosionHitEvent.patch
+++ b/leaf-server/minecraft-patches/features/0267-Add-BlockExplosionHitEvent.patch
--- a/leaf-server/minecraft-patches/features/0268-Old-Blast-Protection-explosion-knockback.patch
+++ b/leaf-server/minecraft-patches/features/0268-Old-Blast-Protection-explosion-knockback.patch
--- a/leaf-server/minecraft-patches/features/0269-Use-UUID-for-cure-reputation.patch
+++ b/leaf-server/minecraft-patches/features/0269-Use-UUID-for-cure-reputation.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Use UUID for cure reputation
 Related MC issue: https://bugs.mojang.com/browse/MC/issues/MC-247647

 diff --git a/net/minecraft/world/entity/monster/ZombieVillager.java b/net/minecraft/world/entity/monster/ZombieVillager.java
-index 1c75ba6c5595f0f554df2844663e8e6904055b23..8b9588e4e3599b3c957896dfd8b24fd0b77e3196 100644
+index 22c1545a0329d56e0ec41ae4da1e1922aa1f9737..e89e4c26c40cbb3ef002022f22886d5faa7869fd 100644
 --- a/net/minecraft/world/entity/monster/ZombieVillager.java
 +++ b/net/minecraft/world/entity/monster/ZombieVillager.java
@@ -283,9 +283,10 @@ public class ZombieVillager extends Zombie implements VillagerDataHolder {
@@ -22,7 +22,7 @@ index 1c75ba6c5595f0f554df2844663e8e6904055b23..8b9588e4e3599b3c957896dfd8b24fd0
                 }
 
 diff --git a/net/minecraft/world/entity/npc/Villager.java b/net/minecraft/world/entity/npc/Villager.java
-index 8257c0d5bd7105c34e310b1a4da99b3cc5f02ac2..5a105cd026583ce33f0f1df24df683bb871b9fe1 100644
+index 743c0c956ddd9e35d3c9c7b45fa8d36490d648dd..c029256175b27bb5f0d30e3fa7371f04c2069fd6 100644
 --- a/net/minecraft/world/entity/npc/Villager.java
 +++ b/net/minecraft/world/entity/npc/Villager.java
@@ -1095,6 +1095,21 @@ public class Villager extends AbstractVillager implements ReputationEventHandler
--- a/leaf-server/minecraft-patches/features/0270-Cache-potential-behaviors-in-Brain.patch
+++ b/leaf-server/minecraft-patches/features/0270-Cache-potential-behaviors-in-Brain.patch
--- a/leaf-server/minecraft-patches/features/0271-Use-ActivationList-on-runningBehaviors.patch
+++ b/leaf-server/minecraft-patches/features/0271-Use-ActivationList-on-runningBehaviors.patch
--- a/leaf-server/minecraft-patches/features/0272-Fix-crash-during-parsing-unknown-command-message.patch
+++ b/leaf-server/minecraft-patches/features/0272-Fix-crash-during-parsing-unknown-command-message.patch
--- a/leaf-server/minecraft-patches/features/0273-optimize-random-tick.patch
+++ b/leaf-server/minecraft-patches/features/0273-optimize-random-tick.patch
--- a/leaf-server/minecraft-patches/features/0274-do-not-log-invalid-flatten-text-component-parse.patch
+++ b/leaf-server/minecraft-patches/features/0274-do-not-log-invalid-flatten-text-component-parse.patch
--- a/leaf-server/minecraft-patches/features/0275-Fast-BiomeManager-seed-obfuscation.patch
+++ b/leaf-server/minecraft-patches/features/0275-Fast-BiomeManager-seed-obfuscation.patch
--- a/leaf-server/minecraft-patches/features/0276-Paw-optimization.patch
+++ b/leaf-server/minecraft-patches/features/0276-Paw-optimization.patch