Fix #276 and #277

LeavesMC · Jul 25, 2024 · 7d09a3a · 7d09a3a
1 parent 36813ac
commit 7d09a3a
Show file tree

Hide file tree

Showing 101 changed files with 40 additions and 41 deletions.
diff --git a/...e-entity-fluid-lookups-if-no-fluids.patch → ...e-entity-fluid-lookups-if-no-fluids.patch b/...e-entity-fluid-lookups-if-no-fluids.patch → ...e-entity-fluid-lookups-if-no-fluids.patch
diff --git a/...r/0033-Reduce-chunk-loading-lookups.patch → ...r/0032-Reduce-chunk-loading-lookups.patch b/...r/0033-Reduce-chunk-loading-lookups.patch → ...r/0032-Reduce-chunk-loading-lookups.patch
diff --git a/...34-InstantBlockUpdater-Reintroduced.patch → ...33-InstantBlockUpdater-Reintroduced.patch b/...34-InstantBlockUpdater-Reintroduced.patch → ...33-InstantBlockUpdater-Reintroduced.patch
diff --git a/...dom-flatten-triangular-distribution.patch → ...dom-flatten-triangular-distribution.patch b/...dom-flatten-triangular-distribution.patch → ...dom-flatten-triangular-distribution.patch
diff --git a/patches/server/0036-BBOR-Protocol.patch → patches/server/0035-BBOR-Protocol.patch b/patches/server/0036-BBOR-Protocol.patch → patches/server/0035-BBOR-Protocol.patch
diff --git a/patches/server/0037-PCA-sync-protocol.patch → patches/server/0036-PCA-sync-protocol.patch b/patches/server/0037-PCA-sync-protocol.patch → patches/server/0036-PCA-sync-protocol.patch
diff --git a/patches/server/0038-Jade-Protocol.patch → patches/server/0037-Jade-Protocol.patch b/patches/server/0038-Jade-Protocol.patch → patches/server/0037-Jade-Protocol.patch
diff --git a/...lternative-block-placement-Protocol.patch → ...lternative-block-placement-Protocol.patch b/...lternative-block-placement-Protocol.patch → ...lternative-block-placement-Protocol.patch
diff --git a/...erver/0040-Player-operation-limiter.patch → ...erver/0039-Player-operation-limiter.patch b/...erver/0040-Player-operation-limiter.patch → ...erver/0039-Player-operation-limiter.patch
diff --git a/patches/server/0041-Renewable-Elytra.patch → patches/server/0040-Renewable-Elytra.patch b/patches/server/0041-Renewable-Elytra.patch → patches/server/0040-Renewable-Elytra.patch
diff --git a/.../server/0042-Stackable-ShulkerBoxes.patch → .../server/0041-Stackable-ShulkerBoxes.patch b/.../server/0042-Stackable-ShulkerBoxes.patch → .../server/0041-Stackable-ShulkerBoxes.patch
diff --git a/...043-Improve-fluid-direction-caching.patch → ...042-Improve-fluid-direction-caching.patch b/...043-Improve-fluid-direction-caching.patch → ...042-Improve-fluid-direction-caching.patch
diff --git a/...ver/0044-MC-Technical-Survival-Mode.patch → ...ver/0043-MC-Technical-Survival-Mode.patch b/...ver/0044-MC-Technical-Survival-Mode.patch → ...ver/0043-MC-Technical-Survival-Mode.patch
diff --git a/...erver/0045-Return-nether-portal-fix.patch → ...erver/0044-Return-nether-portal-fix.patch b/...erver/0045-Return-nether-portal-fix.patch → ...erver/0044-Return-nether-portal-fix.patch
diff --git a/patches/server/0046-Appleskin-Protocol.patch → patches/server/0045-Appleskin-Protocol.patch b/patches/server/0046-Appleskin-Protocol.patch → patches/server/0045-Appleskin-Protocol.patch
diff --git a/patches/server/0047-Xaero-Map-Protocol.patch → patches/server/0046-Xaero-Map-Protocol.patch b/patches/server/0047-Xaero-Map-Protocol.patch → patches/server/0046-Xaero-Map-Protocol.patch
diff --git a/...0048-Leaves-Extra-Yggdrasil-Service.patch → ...0047-Leaves-Extra-Yggdrasil-Service.patch b/...0048-Leaves-Extra-Yggdrasil-Service.patch → ...0047-Leaves-Extra-Yggdrasil-Service.patch
@@ -44,7 +44,7 @@ index 244a19ecd0234fa1d7a6ecfea20751595688605d..7a1f7714616913cbb9d2dfc017567895
              String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cb9aae6ff466c07781963ca818ff7421e6bc3964..7f6a25a186ca6ccd30964cf84b2c634bfb030ec9 100644
+index a0e4e96addc467c6816ebb42263d5ddd1e2e8ff3..f4a4e5ccd904964de8b813642977cdaa052d6989 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -265,7 +265,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

diff --git a/...rver/0049-Use-vanilla-random-config.patch → ...rver/0048-Use-vanilla-random-config.patch b/...rver/0049-Use-vanilla-random-config.patch → ...rver/0048-Use-vanilla-random-config.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use vanilla random config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index decc1d6be70eb501ebf75dd5907fabfbc2584928..993efcba5c43e2ba6d8fd2eb61215ed67c9c6a6b 100644
+index 2563e077ceaf6c21e20f00c59341abcca39c91eb..0f084a9906bd8b20f7b10e47647bfb1b6f7ef710 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -559,7 +559,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -44,7 +44,7 @@ index 42f4e544fe7fbc342f15eacb5e38d40849e3c419..0bd9ee3d0b546564a069f4aaf7a33e35
      }
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index 9f86b2c5af580f27f7216b4184acb72b54fee550..d5ea322202b6f9cdc193d4cf2f43c547009e20ff 100644
+index a2b9e996fa606d91b153979eefae8974f7ffdf4e..9b8991e562e83c0e3a29f868fa19690e4aa2d453 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -79,7 +79,13 @@ public class ItemEntity extends Entity implements TraceableEntity {

diff --git a/...r/0050-Fix-update-suppression-crash.patch → ...r/0049-Fix-update-suppression-crash.patch b/...r/0050-Fix-update-suppression-crash.patch → ...r/0049-Fix-update-suppression-crash.patch
diff --git a/patches/server/0051-Bedrock-break-list.patch → patches/server/0050-Bedrock-break-list.patch b/patches/server/0051-Bedrock-break-list.patch → patches/server/0050-Bedrock-break-list.patch
diff --git a/...es/server/0052-Fix-trapdoor-feature.patch → ...es/server/0051-Fix-trapdoor-feature.patch b/...es/server/0052-Fix-trapdoor-feature.patch → ...es/server/0051-Fix-trapdoor-feature.patch
diff --git a/...-distance-check-for-UseItemOnPacket.patch → ...-distance-check-for-UseItemOnPacket.patch b/...-distance-check-for-UseItemOnPacket.patch → ...-distance-check-for-UseItemOnPacket.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7796e191747be545e744564a2b0b65790f69114d..bef88d547aefa9c5b701aa91ffc58114309a7db7 100644
+index 7cab641e609cabdb56dc6a9d1efe2e20c1e0f5d2..c87dc4d99e7ea8395145946c9c5cc5e73113cb23 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1860,7 +1860,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

diff --git a/...ver/0054-No-feather-falling-trample.patch → ...ver/0053-No-feather-falling-trample.patch b/...ver/0054-No-feather-falling-trample.patch → ...ver/0053-No-feather-falling-trample.patch
diff --git a/...hes/server/0055-Syncmatica-Protocol.patch → ...hes/server/0054-Syncmatica-Protocol.patch b/...hes/server/0055-Syncmatica-Protocol.patch → ...hes/server/0054-Syncmatica-Protocol.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Syncmatica Protocol
 This patch is Powered by Syncmatica(https://github.com/End-Tech/syncmatica)
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bef88d547aefa9c5b701aa91ffc58114309a7db7..51a1be78de7a794d13b64db6958977e2e9d20553 100644
+index c87dc4d99e7ea8395145946c9c5cc5e73113cb23..32d8d22f5e08f6ebdd06b5057fe1b0451acdf1f2 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -314,6 +314,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

diff --git a/...rver/0056-Shared-villager-discounts.patch → ...rver/0055-Shared-villager-discounts.patch b/...rver/0056-Shared-villager-discounts.patch → ...rver/0055-Shared-villager-discounts.patch
diff --git a/...ne-wire-dont-connect-if-on-trapdoor.patch → ...ne-wire-dont-connect-if-on-trapdoor.patch b/...ne-wire-dont-connect-if-on-trapdoor.patch → ...ne-wire-dont-connect-if-on-trapdoor.patch
diff --git a/...-Disable-check-out-of-order-command.patch → ...-Disable-check-out-of-order-command.patch b/...-Disable-check-out-of-order-command.patch → ...-Disable-check-out-of-order-command.patch
diff --git a/...er/0059-Despawn-enderman-with-block.patch → ...er/0058-Despawn-enderman-with-block.patch b/...er/0059-Despawn-enderman-with-block.patch → ...er/0058-Despawn-enderman-with-block.patch
diff --git a/...s/server/0060-Leaves-carpet-support.patch → ...s/server/0059-Leaves-carpet-support.patch b/...s/server/0060-Leaves-carpet-support.patch → ...s/server/0059-Leaves-carpet-support.patch
diff --git a/...es/server/0061-Creative-fly-no-clip.patch → ...es/server/0060-Creative-fly-no-clip.patch b/...es/server/0061-Creative-fly-no-clip.patch → ...es/server/0060-Creative-fly-no-clip.patch
diff --git a/...erver/0062-Optimized-dragon-respawn.patch → ...erver/0061-Optimized-dragon-respawn.patch b/...erver/0062-Optimized-dragon-respawn.patch → ...erver/0061-Optimized-dragon-respawn.patch
diff --git a/patches/server/0063-Shave-snow-layers.patch → patches/server/0062-Shave-snow-layers.patch b/patches/server/0063-Shave-snow-layers.patch → patches/server/0062-Shave-snow-layers.patch
diff --git a/patches/server/0064-Spawn-ignore-lc.patch → patches/server/0063-Spawn-ignore-lc.patch b/patches/server/0064-Spawn-ignore-lc.patch → patches/server/0063-Spawn-ignore-lc.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn ignore lc
 
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index f0713e797b7ddfd39ebf96712983244f0abcf543..5184df047c329323dfd1ebbf122963b4add098c3 100644
+index c5b26fdb173a59280e790a5d5a687e0c0114bb74..7cb97b7623b603aa5469c92f5a6816673c994540 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -199,6 +199,19 @@ public final class NaturalSpawner {

diff --git a/...65-Elytra-aeronautics-no-chunk-load.patch → ...64-Elytra-aeronautics-no-chunk-load.patch b/...65-Elytra-aeronautics-no-chunk-load.patch → ...64-Elytra-aeronautics-no-chunk-load.patch
@@ -27,7 +27,7 @@ index d9c36827706776e143fccd72b53c12a9ac455475..59c023076a7a64049ba478aa049f1910
 
          SectionPos sectionposition = player.getLastSectionPos();
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 51a1be78de7a794d13b64db6958977e2e9d20553..31ad4e4aaf321ab3c3909145e36a67744d906c65 100644
+index 32d8d22f5e08f6ebdd06b5057fe1b0451acdf1f2..6556fc94295d66eec90492c051053bf24cc8ebd4 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -559,7 +559,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -40,7 +40,7 @@ index 51a1be78de7a794d13b64db6958977e2e9d20553..31ad4e4aaf321ab3c3909145e36a6774
                          !worldserver.areChunksLoadedForMove(entity.getBoundingBox().expandTowards(new Vec3(toX, toY, toZ).subtract(entity.position())))
                      )) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 993efcba5c43e2ba6d8fd2eb61215ed67c9c6a6b..3ea0530917fbd347691427cd44344b4659fc6e09 100644
+index 0f084a9906bd8b20f7b10e47647bfb1b6f7ef710..d6b90cc6e94d3e81a336cf15910a0c89e69fa96b 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1136,7 +1136,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/patches/server/0066-Cache-ignite-odds.patch → patches/server/0065-Cache-ignite-odds.patch b/patches/server/0066-Cache-ignite-odds.patch → patches/server/0065-Cache-ignite-odds.patch
diff --git a/patches/server/0067-Lava-riptide.patch → patches/server/0066-Lava-riptide.patch b/patches/server/0067-Lava-riptide.patch → patches/server/0066-Lava-riptide.patch
diff --git a/...server/0068-No-block-update-command.patch → ...server/0067-No-block-update-command.patch b/...server/0068-No-block-update-command.patch → ...server/0067-No-block-update-command.patch
diff --git a/...069-Raider-die-skip-self-raid-check.patch → ...068-Raider-die-skip-self-raid-check.patch b/...069-Raider-die-skip-self-raid-check.patch → ...068-Raider-die-skip-self-raid-check.patch
diff --git a/...ver/0070-Container-open-passthrough.patch → ...ver/0069-Container-open-passthrough.patch b/...ver/0070-Container-open-passthrough.patch → ...ver/0069-Container-open-passthrough.patch
diff --git a/patches/server/0071-SIMD-support.patch → patches/server/0070-SIMD-support.patch b/patches/server/0071-SIMD-support.patch → patches/server/0070-SIMD-support.patch
diff --git a/...ont-respond-ping-before-start-fully.patch → ...ont-respond-ping-before-start-fully.patch b/...ont-respond-ping-before-start-fully.patch → ...ont-respond-ping-before-start-fully.patch
diff --git a/...ver/0073-Faster-chunk-serialization.patch → ...ver/0072-Faster-chunk-serialization.patch b/...ver/0073-Faster-chunk-serialization.patch → ...ver/0072-Faster-chunk-serialization.patch
diff --git a/...074-Cache-world-generator-sea-level.patch → ...073-Cache-world-generator-sea-level.patch b/...074-Cache-world-generator-sea-level.patch → ...073-Cache-world-generator-sea-level.patch
diff --git a/patches/server/0075-Bladeren-Protocol.patch → patches/server/0074-Bladeren-Protocol.patch b/patches/server/0075-Bladeren-Protocol.patch → patches/server/0074-Bladeren-Protocol.patch
diff --git a/...Skip-secondary-POI-sensor-if-absent.patch → ...Skip-secondary-POI-sensor-if-absent.patch b/...Skip-secondary-POI-sensor-if-absent.patch → ...Skip-secondary-POI-sensor-if-absent.patch
diff --git a/...er/0077-Bladeren-mspt-sync-protocol.patch → ...er/0076-Bladeren-mspt-sync-protocol.patch b/...er/0077-Bladeren-mspt-sync-protocol.patch → ...er/0076-Bladeren-mspt-sync-protocol.patch
diff --git a/...r/0078-Store-mob-counts-in-an-array.patch → ...r/0077-Store-mob-counts-in-an-array.patch b/...r/0078-Store-mob-counts-in-an-array.patch → ...r/0077-Store-mob-counts-in-an-array.patch
diff --git a/...r/0079-Cache-BlockStatePairKey-hash.patch → ...r/0078-Cache-BlockStatePairKey-hash.patch b/...r/0079-Cache-BlockStatePairKey-hash.patch → ...r/0078-Cache-BlockStatePairKey-hash.patch
diff --git a/...rver/0080-Optimize-noise-generation.patch → ...rver/0079-Optimize-noise-generation.patch b/...rver/0080-Optimize-noise-generation.patch → ...rver/0079-Optimize-noise-generation.patch
diff --git a/...es/server/0081-Disable-packet-limit.patch → ...es/server/0080-Disable-packet-limit.patch b/...es/server/0081-Disable-packet-limit.patch → ...es/server/0080-Disable-packet-limit.patch
diff --git a/...erver/0082-Reduce-array-allocations.patch → ...erver/0081-Reduce-array-allocations.patch b/...erver/0082-Reduce-array-allocations.patch → ...erver/0081-Reduce-array-allocations.patch
@@ -218,7 +218,7 @@ index 0846e11c82295ccf93683f877962ec7804dad677..b747b3858befe48996ea707cf126f6f8
 
              for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 5f779bce04ee8c687550c1386f73550c12da1892..d43f8be8132d825bc84daaa56cc624654e3f04a8 100644
+index b79d34a8cfbe562e53960062d8dd9e9e5156a9ed..1b33ac2eaa4d938f8e930fb2bfcc7169f10f851f 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -181,6 +181,7 @@ import org.bukkit.event.server.MapInitializeEvent;
@@ -230,7 +230,7 @@ index 5f779bce04ee8c687550c1386f73550c12da1892..d43f8be8132d825bc84daaa56cc62465
  public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel, ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevelReader { // Paper - rewrite chunk system
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 31ad4e4aaf321ab3c3909145e36a67744d906c65..7ba4f9926a8945651e55aeca99e3badaf258546e 100644
+index 6556fc94295d66eec90492c051053bf24cc8ebd4..ec131f0041f9a2167f06a5fc85c2fd01f6062531 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -249,6 +249,7 @@ import org.bukkit.inventory.EquipmentSlot;

diff --git a/.../server/0083-Optimize-sun-burn-tick.patch → .../server/0082-Optimize-sun-burn-tick.patch b/.../server/0083-Optimize-sun-burn-tick.patch → .../server/0082-Optimize-sun-burn-tick.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize sun burn tick
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d32b658a659c8a139060ac96289ca7497f085d52..8067263c419febe749d15e51511c769d97f325ba 100644
+index d6b90cc6e94d3e81a336cf15910a0c89e69fa96b..34610ab46a46a654742132ee35d3ec180d97d2ab 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2078,8 +2078,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...-Optional-allocation-in-EntityBased.patch → ...-Optional-allocation-in-EntityBased.patch b/...-Optional-allocation-in-EntityBased.patch → ...-Optional-allocation-in-EntityBased.patch
diff --git a/...ignableFrom-call-in-ClassInstanceMu.patch → ...ignableFrom-call-in-ClassInstanceMu.patch b/...ignableFrom-call-in-ClassInstanceMu.patch → ...ignableFrom-call-in-ClassInstanceMu.patch
diff --git a/...erver/0086-Optimized-CubePointRange.patch → ...erver/0085-Optimized-CubePointRange.patch b/...erver/0086-Optimized-CubePointRange.patch → ...erver/0085-Optimized-CubePointRange.patch
diff --git a/...k-frozen-ticks-before-landing-block.patch → ...k-frozen-ticks-before-landing-block.patch b/...k-frozen-ticks-before-landing-block.patch → ...k-frozen-ticks-before-landing-block.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Check frozen ticks before landing block
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2c385a89db50d85ff65df7b20dcfefdc21856cca..f45c1d6ec163566b7877cf4ec6809b3bb603bb30 100644
+index a160a6b3a8634d142436ba4098da219cf4d825a8..fc6bbe34b6ff4912d34f86196c6d55d7116dcedb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -564,11 +564,11 @@ public abstract class LivingEntity extends Entity implements Attackable {

diff --git a/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch b/...kip-entity-move-if-movement-is-zero.patch → ...kip-entity-move-if-movement-is-zero.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Skip entity move if movement is zero
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8067263c419febe749d15e51511c769d97f325ba..024ec708fb1dd85f270b1864176e7d70414a225b 100644
+index 34610ab46a46a654742132ee35d3ec180d97d2ab..85afcaaa2fee449139e68cdc346738403edc0fdd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -324,6 +324,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...9-Skip-cloning-advancement-criteria.patch → ...8-Skip-cloning-advancement-criteria.patch b/...9-Skip-cloning-advancement-criteria.patch → ...8-Skip-cloning-advancement-criteria.patch
diff --git a/...ible-planar-movement-multiplication.patch → ...ible-planar-movement-multiplication.patch b/...ible-planar-movement-multiplication.patch → ...ible-planar-movement-multiplication.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Skip negligible planar movement multiplication
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ad919f7c613549a25656109fc66251dcf9f7989b..056f56fd321aa2f23b633f7c59672e2ef4c32a9e 100644
+index 85afcaaa2fee449139e68cdc346738403edc0fdd..582d7221b8af8d96909cf240913168fc09c966c4 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1285,9 +1285,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...1-Fix-villagers-dont-release-memory.patch → ...0-Fix-villagers-dont-release-memory.patch b/...1-Fix-villagers-dont-release-memory.patch → ...0-Fix-villagers-dont-release-memory.patch
diff --git a/...rver/0092-Avoid-anvil-too-expensive.patch → ...rver/0091-Avoid-anvil-too-expensive.patch b/...rver/0092-Avoid-anvil-too-expensive.patch → ...rver/0091-Avoid-anvil-too-expensive.patch
diff --git a/patches/server/0092-Bow-infinity-fix.patch b/patches/server/0092-Bow-infinity-fix.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: violetc <[email protected]>
+Date: Mon, 24 Jul 2023 15:54:18 +0800
+Subject: [PATCH] Bow infinity fix
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
+index 0ee227c0f7d54ed7c686a830873fab6c0cdd2ab5..e381b2d0e64b8d9834b573223f6370afc7c00b11 100644
+--- a/src/main/java/net/minecraft/world/entity/player/Player.java
++++ b/src/main/java/net/minecraft/world/entity/player/Player.java
+@@ -2342,7 +2342,7 @@ public abstract class Player extends LivingEntity {
+                     }
+                 }
+
+-                return this.abilities.instabuild ? new ItemStack(Items.ARROW) : ItemStack.EMPTY;
++                return this.abilities.instabuild || (org.leavesmc.leaves.LeavesConfig.bowInfinityFix && net.minecraft.world.item.enchantment.EnchantmentHelper.processAmmoUse((ServerLevel) this.level(), stack, new ItemStack(Items.ARROW), 1) <= 0) ? new ItemStack(Items.ARROW) : ItemStack.EMPTY;
+             }
+         }
+     }
diff --git a/patches/server/0093-Bow-infinity-fix.patch b/patches/server/0093-Bow-infinity-fix.patch
diff --git a/patches/server/0094-Zero-tick-plants.patch → patches/server/0093-Zero-tick-plants.patch b/patches/server/0094-Zero-tick-plants.patch → patches/server/0093-Zero-tick-plants.patch
diff --git a/patches/server/0095-Leaves-Updater.patch → patches/server/0094-Leaves-Updater.patch b/patches/server/0095-Leaves-Updater.patch → patches/server/0094-Leaves-Updater.patch
diff --git a/...ver/0096-Force-peaceful-mode-switch.patch → ...ver/0095-Force-peaceful-mode-switch.patch b/...ver/0096-Force-peaceful-mode-switch.patch → ...ver/0095-Force-peaceful-mode-switch.patch
diff --git a/patches/server/0097-Replay-Mod-API.patch → patches/server/0096-Replay-Mod-API.patch b/patches/server/0097-Replay-Mod-API.patch → patches/server/0096-Replay-Mod-API.patch
diff --git a/patches/server/0098-Leaves-I18n.patch → patches/server/0097-Leaves-I18n.patch b/patches/server/0098-Leaves-I18n.patch → patches/server/0097-Leaves-I18n.patch
diff --git a/...raft-hopper-not-work-without-player.patch → ...raft-hopper-not-work-without-player.patch b/...raft-hopper-not-work-without-player.patch → ...raft-hopper-not-work-without-player.patch
diff --git a/patches/server/0100-RNG-Fishing.patch → patches/server/0099-RNG-Fishing.patch b/patches/server/0100-RNG-Fishing.patch → patches/server/0099-RNG-Fishing.patch
diff --git a/...hes/server/0101-Wool-Hopper-Counter.patch → ...hes/server/0100-Wool-Hopper-Counter.patch b/...hes/server/0101-Wool-Hopper-Counter.patch → ...hes/server/0100-Wool-Hopper-Counter.patch
diff --git a/...s/server/0102-Leaves-Reload-Command.patch → ...s/server/0101-Leaves-Reload-Command.patch b/...s/server/0102-Leaves-Reload-Command.patch → ...s/server/0101-Leaves-Reload-Command.patch
diff --git a/...er/0103-Spider-jockeys-drop-gapples.patch → ...er/0102-Spider-jockeys-drop-gapples.patch b/...er/0103-Spider-jockeys-drop-gapples.patch → ...er/0102-Spider-jockeys-drop-gapples.patch
diff --git a/patches/server/0104-Force-Void-Trade.patch → patches/server/0103-Force-Void-Trade.patch b/patches/server/0104-Force-Void-Trade.patch → patches/server/0103-Force-Void-Trade.patch
diff --git a/...er/0105-Villager-infinite-discounts.patch → ...er/0104-Villager-infinite-discounts.patch b/...er/0105-Villager-infinite-discounts.patch → ...er/0104-Villager-infinite-discounts.patch
diff --git a/.../server/0106-CCE-update-suppression.patch → .../server/0105-CCE-update-suppression.patch b/.../server/0106-CCE-update-suppression.patch → .../server/0105-CCE-update-suppression.patch
diff --git a/...7-Disable-offline-warn-if-use-proxy.patch → ...6-Disable-offline-warn-if-use-proxy.patch b/...7-Disable-offline-warn-if-use-proxy.patch → ...6-Disable-offline-warn-if-use-proxy.patch
diff --git a/...108-Disable-moved-wrongly-threshold.patch → ...107-Disable-moved-wrongly-threshold.patch b/...108-Disable-moved-wrongly-threshold.patch → ...107-Disable-moved-wrongly-threshold.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Disable moved wrongly threshold
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7ba4f9926a8945651e55aeca99e3badaf258546e..b65ef0e04836b85b31e3681b4b25f94c84f9692b 100644
+index ec131f0041f9a2167f06a5fc85c2fd01f6062531..3c32c735bf7ed2bcfbd48140543b33ace48bc3c8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -569,7 +569,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

diff --git a/...r-stand-cant-kill-by-mob-projectile.patch → ...r-stand-cant-kill-by-mob-projectile.patch b/...r-stand-cant-kill-by-mob-projectile.patch → ...r-stand-cant-kill-by-mob-projectile.patch
diff --git a/.../server/0110-Make-Item-tick-vanilla.patch → .../server/0109-Make-Item-tick-vanilla.patch b/.../server/0110-Make-Item-tick-vanilla.patch → .../server/0109-Make-Item-tick-vanilla.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Make Item tick vanilla
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
-index d5ea322202b6f9cdc193d4cf2f43c547009e20ff..26cdc6d7e8026c5290681b87b6b54bb3b7731f1c 100644
+index 9b8991e562e83c0e3a29f868fa19690e4aa2d453..75001a1161a5c6dabd84c688424deadb87d3da67 100644
 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
 @@ -252,6 +252,9 @@ public class ItemEntity extends Entity implements TraceableEntity {

diff --git a/.../server/0111-Copper-Bulb-1-gt-delay.patch → .../server/0110-Copper-Bulb-1-gt-delay.patch b/.../server/0111-Copper-Bulb-1-gt-delay.patch → .../server/0110-Copper-Bulb-1-gt-delay.patch
diff --git a/patches/server/0112-Crafter-1-gt-delay.patch → patches/server/0111-Crafter-1-gt-delay.patch b/patches/server/0112-Crafter-1-gt-delay.patch → patches/server/0111-Crafter-1-gt-delay.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Crafter 1 gt delay
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/CrafterBlock.java b/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
-index 6c24b25a7c8ce6e34aceb5702f1a0a6732ebca44..d9caca74221e7173096671caae83ba171f4732df 100644
+index 391a6af36d4c27a04000b31583297a25b89125d3..b94c5ba94f1e08bc173d8e35cffb67ba736aee18 100644
 --- a/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CrafterBlock.java
 @@ -80,7 +80,7 @@ public class CrafterBlock extends BaseEntityBlock {

diff --git a/...rver/0113-Linear-region-file-format.patch → ...rver/0112-Linear-region-file-format.patch b/...rver/0113-Linear-region-file-format.patch → ...rver/0112-Linear-region-file-format.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Linear region file format
 This patch is Powered by LinearPurpur(https://github.com/StupidCraft/LinearPurpur)
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a04666cc380118c03b6b23df140323659e38c065..0ce1157599acfe8181839955ae76697b4ac6474d 100644
+index c06861f287088c04363f45d6e91d29a8596cf8d4..51af52ca06c237fa80df8df8fce86147b6390a08 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -30,6 +30,10 @@ dependencies {

diff --git a/...hes/server/0114-No-TNT-place-update.patch → ...hes/server/0113-No-TNT-place-update.patch b/...hes/server/0114-No-TNT-place-update.patch → ...hes/server/0113-No-TNT-place-update.patch
diff --git a/patches/server/0115-Servux-Protocol.patch → patches/server/0114-Servux-Protocol.patch b/patches/server/0115-Servux-Protocol.patch → patches/server/0114-Servux-Protocol.patch
diff --git a/...ed-hopper-no-longer-send-NC-updates.patch → ...ed-hopper-no-longer-send-NC-updates.patch b/...ed-hopper-no-longer-send-NC-updates.patch → ...ed-hopper-no-longer-send-NC-updates.patch
diff --git a/...hes/server/0117-Renewable-deepslate.patch → ...hes/server/0116-Renewable-deepslate.patch b/...hes/server/0117-Renewable-deepslate.patch → ...hes/server/0116-Renewable-deepslate.patch
diff --git a/patches/server/0118-Renewable-sponges.patch → patches/server/0117-Renewable-sponges.patch b/patches/server/0118-Renewable-sponges.patch → patches/server/0117-Renewable-sponges.patch
diff --git a/patches/server/0119-Renewable-coral.patch → patches/server/0118-Renewable-coral.patch b/patches/server/0119-Renewable-coral.patch → patches/server/0118-Renewable-coral.patch
diff --git a/patches/server/0120-Fast-resume.patch → patches/server/0119-Fast-resume.patch b/patches/server/0120-Fast-resume.patch → patches/server/0119-Fast-resume.patch
diff --git a/patches/server/0121-Vanilla-hopper.patch → patches/server/0120-Vanilla-hopper.patch b/patches/server/0121-Vanilla-hopper.patch → patches/server/0120-Vanilla-hopper.patch
diff --git a/...server/0122-Force-minecraft-command.patch → ...server/0121-Force-minecraft-command.patch b/...server/0122-Force-minecraft-command.patch → ...server/0121-Force-minecraft-command.patch
diff --git a/...-Fix-falling-block-s-block-location.patch → ...-Fix-falling-block-s-block-location.patch b/...-Fix-falling-block-s-block-location.patch → ...-Fix-falling-block-s-block-location.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix falling block's block location
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 056f56fd321aa2f23b633f7c59672e2ef4c32a9e..73afd4ac34b5e7e26d8acdf59ad60cae2762df57 100644
+index 582d7221b8af8d96909cf240913168fc09c966c4..ef01ecfb6f13e2991bf71b447b833c01f3c89abd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4838,6 +4838,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4751,6 +4751,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              int j = Mth.floor(y);
              int k = Mth.floor(z);
 

diff --git a/...4-Fix-NPE-during-creating-GUI-graph.patch → ...3-Fix-NPE-during-creating-GUI-graph.patch b/...4-Fix-NPE-during-creating-GUI-graph.patch → ...3-Fix-NPE-during-creating-GUI-graph.patch
diff --git a/patches/server/0125-Bytebuf-API.patch → patches/server/0124-Bytebuf-API.patch b/patches/server/0125-Bytebuf-API.patch → patches/server/0124-Bytebuf-API.patch
diff --git a/.../0126-Allow-grindstone-overstacking.patch → .../0125-Allow-grindstone-overstacking.patch b/.../0126-Allow-grindstone-overstacking.patch → .../0125-Allow-grindstone-overstacking.patch
diff --git a/patches/server/0127-Configurable-MC-67.patch → patches/server/0126-Configurable-MC-67.patch b/patches/server/0127-Configurable-MC-67.patch → patches/server/0126-Configurable-MC-67.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable MC-67
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 73afd4ac34b5e7e26d8acdf59ad60cae2762df57..4113a4e5252bbff1047f1119e9fef94f00fa0693 100644
+index ef01ecfb6f13e2991bf71b447b833c01f3c89abd..c16a4f9f4dfc05786f1baab0318a65245f920a72 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -3914,7 +3914,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

diff --git a/...e-end-gateway-portal-entity-ticking.patch → ...e-end-gateway-portal-entity-ticking.patch b/...e-end-gateway-portal-entity-ticking.patch → ...e-end-gateway-portal-entity-ticking.patch
diff --git a/...able-crystal-portal-proximity-check.patch → ...able-crystal-portal-proximity-check.patch b/...able-crystal-portal-proximity-check.patch → ...able-crystal-portal-proximity-check.patch
diff --git a/...ble-LivingEntity-aiStep-alive-check.patch → ...ble-LivingEntity-aiStep-alive-check.patch b/...ble-LivingEntity-aiStep-alive-check.patch → ...ble-LivingEntity-aiStep-alive-check.patch
diff --git a/patches/server/0131-Leaves-plugins.patch → patches/server/0130-Leaves-plugins.patch b/patches/server/0131-Leaves-plugins.patch → patches/server/0130-Leaves-plugins.patch