diff --git a/gradle.properties b/gradle.properties index 45aeb74a..7a0ff7b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=org.leavesmc.leaves version=1.21.1-R0.1-SNAPSHOT mcVersion=1.21.1 -paperRef=1798e949e5727f376ccaee51873f21dcdedc9a5f +paperRef=7c9240f4a63b13be1fdcedbfb0270f9b49b75518 preVersion=false updatingMinecraft=false org.gradle.jvmargs=-Xmx2G diff --git a/patches/server/0021-Optimize-suffocation.patch b/patches/server/0020-Optimize-suffocation.patch similarity index 95% rename from patches/server/0021-Optimize-suffocation.patch rename to patches/server/0020-Optimize-suffocation.patch index 44e187ab..2f3fec80 100644 --- a/patches/server/0021-Optimize-suffocation.patch +++ b/patches/server/0020-Optimize-suffocation.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize suffocation This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3fb2b77c519992d5ac863f99a126468fdff9e458..e907b60c0898fb8ef5c79a11e68fe2a29392a5db 100644 +index 15386ed5c4304f85ff3edd9bbf95db9144c28523..0556500fde799583a65a82d00a6b2c65a1757d5e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -448,7 +448,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0022-Only-check-for-spooky-season-once-an-hour.patch b/patches/server/0021-Only-check-for-spooky-season-once-an-hour.patch similarity index 100% rename from patches/server/0022-Only-check-for-spooky-season-once-an-hour.patch rename to patches/server/0021-Only-check-for-spooky-season-once-an-hour.patch diff --git a/patches/server/0023-Early-return-optimization-for-target-finding.patch b/patches/server/0022-Early-return-optimization-for-target-finding.patch similarity index 100% rename from patches/server/0023-Early-return-optimization-for-target-finding.patch rename to patches/server/0022-Early-return-optimization-for-target-finding.patch diff --git a/patches/server/0024-Config-to-disable-method-profiler.patch b/patches/server/0023-Config-to-disable-method-profiler.patch similarity index 100% rename from patches/server/0024-Config-to-disable-method-profiler.patch rename to patches/server/0023-Config-to-disable-method-profiler.patch diff --git a/patches/server/0025-Throttle-goal-selector-during-inactive-ticking.patch b/patches/server/0024-Throttle-goal-selector-during-inactive-ticking.patch similarity index 93% rename from patches/server/0025-Throttle-goal-selector-during-inactive-ticking.patch rename to patches/server/0024-Throttle-goal-selector-during-inactive-ticking.patch index fc1ae1d2..efc5e90e 100644 --- a/patches/server/0025-Throttle-goal-selector-during-inactive-ticking.patch +++ b/patches/server/0024-Throttle-goal-selector-during-inactive-ticking.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Throttle goal selector during inactive ticking This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 7b93c6a04cca2ac31d137f06ef83bb08559b10bf..5c20fad61b81189ad45623346fa2b79ea8aa9b2a 100644 +index bd7c6ce15698aed70376c109ba36f52d6794a2f8..9f2ef5ea9f380e78d4a150df9f16ff6bfc398b75 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -232,11 +232,13 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab diff --git a/patches/server/0026-Reduce-entity-allocations.patch b/patches/server/0025-Reduce-entity-allocations.patch similarity index 100% rename from patches/server/0026-Reduce-entity-allocations.patch rename to patches/server/0025-Reduce-entity-allocations.patch diff --git a/patches/server/0027-Remove-lambda-from-ticking-guard.patch b/patches/server/0026-Remove-lambda-from-ticking-guard.patch similarity index 100% rename from patches/server/0027-Remove-lambda-from-ticking-guard.patch rename to patches/server/0026-Remove-lambda-from-ticking-guard.patch diff --git a/patches/server/0028-Remove-iterators-from-inventory-contains.patch b/patches/server/0027-Remove-iterators-from-inventory-contains.patch similarity index 100% rename from patches/server/0028-Remove-iterators-from-inventory-contains.patch rename to patches/server/0027-Remove-iterators-from-inventory-contains.patch diff --git a/patches/server/0029-Remove-streams-and-iterators-from-range-check.patch b/patches/server/0028-Remove-streams-and-iterators-from-range-check.patch similarity index 100% rename from patches/server/0029-Remove-streams-and-iterators-from-range-check.patch rename to patches/server/0028-Remove-streams-and-iterators-from-range-check.patch diff --git a/patches/server/0030-Cache-climbing-check-for-activation.patch b/patches/server/0029-Cache-climbing-check-for-activation.patch similarity index 95% rename from patches/server/0030-Cache-climbing-check-for-activation.patch rename to patches/server/0029-Cache-climbing-check-for-activation.patch index a0747c53..5bcfed4b 100644 --- a/patches/server/0030-Cache-climbing-check-for-activation.patch +++ b/patches/server/0029-Cache-climbing-check-for-activation.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Cache climbing check for activation This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 638cd59904499bc4dba7ff68d5676117a654ef86..abf5025cbab6c8f7902bd732ffaca07d1659ca62 100644 +index 0556500fde799583a65a82d00a6b2c65a1757d5e..408700b2236b4e04baebe23b47e72722006e3e23 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2073,6 +2073,22 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0031-Use-aging-cache-for-biome-temperatures.patch b/patches/server/0030-Use-aging-cache-for-biome-temperatures.patch similarity index 100% rename from patches/server/0031-Use-aging-cache-for-biome-temperatures.patch rename to patches/server/0030-Use-aging-cache-for-biome-temperatures.patch diff --git a/patches/server/0032-Reduce-chunk-loading-lookups.patch b/patches/server/0031-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0032-Reduce-chunk-loading-lookups.patch rename to patches/server/0031-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0033-InstantBlockUpdater-Reintroduced.patch b/patches/server/0032-InstantBlockUpdater-Reintroduced.patch similarity index 100% rename from patches/server/0033-InstantBlockUpdater-Reintroduced.patch rename to patches/server/0032-InstantBlockUpdater-Reintroduced.patch diff --git a/patches/server/0034-Random-flatten-triangular-distribution.patch b/patches/server/0033-Random-flatten-triangular-distribution.patch similarity index 100% rename from patches/server/0034-Random-flatten-triangular-distribution.patch rename to patches/server/0033-Random-flatten-triangular-distribution.patch diff --git a/patches/server/0035-BBOR-Protocol.patch b/patches/server/0034-BBOR-Protocol.patch similarity index 100% rename from patches/server/0035-BBOR-Protocol.patch rename to patches/server/0034-BBOR-Protocol.patch diff --git a/patches/server/0036-PCA-sync-protocol.patch b/patches/server/0035-PCA-sync-protocol.patch similarity index 99% rename from patches/server/0036-PCA-sync-protocol.patch rename to patches/server/0035-PCA-sync-protocol.patch index 66642f31..7f5279a1 100644 --- a/patches/server/0036-PCA-sync-protocol.patch +++ b/patches/server/0035-PCA-sync-protocol.patch @@ -240,7 +240,7 @@ index 431fb6a658c6aac43b6f9dbd1f578b83f261a4e3..138c045dc694c596083bc2f23831ca22 protected Component getDefaultName() { return Component.translatable("container.dispenser"); diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 53f9d28bf3c6aafd4fdd6c12e0285500fe7350ce..5b7eedaa4f52ac72da417358034f3f457d6a2b45 100644 +index cab403efd471bb61835224eea4e99570d34dcaaa..f7a6296773defc95215bdf36d8ea105cf9590a9e 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -134,6 +134,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/patches/server/0037-Jade-Protocol.patch b/patches/server/0036-Jade-Protocol.patch similarity index 100% rename from patches/server/0037-Jade-Protocol.patch rename to patches/server/0036-Jade-Protocol.patch diff --git a/patches/server/0038-Alternative-block-placement-Protocol.patch b/patches/server/0037-Alternative-block-placement-Protocol.patch similarity index 100% rename from patches/server/0038-Alternative-block-placement-Protocol.patch rename to patches/server/0037-Alternative-block-placement-Protocol.patch diff --git a/patches/server/0039-Player-operation-limiter.patch b/patches/server/0038-Player-operation-limiter.patch similarity index 98% rename from patches/server/0039-Player-operation-limiter.patch rename to patches/server/0038-Player-operation-limiter.patch index 0e870b84..87b90182 100644 --- a/patches/server/0039-Player-operation-limiter.patch +++ b/patches/server/0038-Player-operation-limiter.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 40dfc96bbcd1f85a5917c458ae3a8e3c1574c667..b25ce140c29675e16a8ba1caa02bc2318c738734 100644 +index 647a6c9dd39e113625377273281d74ae3f902f96..2852e569c11af9281f5e81659525898bcfea372a 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -302,6 +302,10 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple diff --git a/patches/server/0040-Renewable-Elytra.patch b/patches/server/0039-Renewable-Elytra.patch similarity index 100% rename from patches/server/0040-Renewable-Elytra.patch rename to patches/server/0039-Renewable-Elytra.patch diff --git a/patches/server/0041-Stackable-ShulkerBoxes.patch b/patches/server/0040-Stackable-ShulkerBoxes.patch similarity index 100% rename from patches/server/0041-Stackable-ShulkerBoxes.patch rename to patches/server/0040-Stackable-ShulkerBoxes.patch diff --git a/patches/server/0042-Improve-fluid-direction-caching.patch b/patches/server/0041-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0042-Improve-fluid-direction-caching.patch rename to patches/server/0041-Improve-fluid-direction-caching.patch diff --git a/patches/server/0043-MC-Technical-Survival-Mode.patch b/patches/server/0042-MC-Technical-Survival-Mode.patch similarity index 97% rename from patches/server/0043-MC-Technical-Survival-Mode.patch rename to patches/server/0042-MC-Technical-Survival-Mode.patch index 0324eb1c..50545644 100644 --- a/patches/server/0043-MC-Technical-Survival-Mode.patch +++ b/patches/server/0042-MC-Technical-Survival-Mode.patch @@ -52,7 +52,7 @@ index 5a97f8a853664a3ced63215a386286873a6c7a95..f10018a3f79744ce0c78ee3020ec0f5d pearl.ownerUUID = null; } diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index b25ce140c29675e16a8ba1caa02bc2318c738734..850558feb4f54b99755f912fac24f001cc9f88e3 100644 +index 2852e569c11af9281f5e81659525898bcfea372a..55e8802526effaa30fbf7ae5a1b5db7929d668a7 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1634,7 +1634,7 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -91,7 +91,7 @@ index 42bd2d9a1528b6210e4dfb56233062fd97c9743b..8d494b549abb452bb554220060cc9c5b this.applyGravity(); this.move(MoverType.SELF, this.getDeltaMovement()); diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index a01c0d9ae53d1b748c5da914069bd672cb1215c7..f13baecabf3bca1275a8c400741f77557f2c1b19 100644 +index de64de5d1328d3e0826c9990eb7c7eca5088cb9c..52a9d04a7d013283a9de0a6a81c54f28cd41bb5e 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java @@ -126,7 +126,7 @@ public abstract class Projectile extends Entity implements TraceableEntity { @@ -117,7 +117,7 @@ index 8205d34ed80781b2aab1fb2ef59986b9370f0198..c5b26fdb173a59280e790a5d5a687e0c entity.spawnReason == org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CHUNK_GEN)) { continue; diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index b6a419ab08a8ee1ddffa234ddc07027ce5296ca8..23f77efe1a0a6ff6398308ce133be762da2a6d0c 100644 +index 5f394cda052271b6ecfafc325733e5ae0524822f..cee74a6c47cd56a17a8faf68405fee09d6fd4655 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -295,7 +295,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/patches/server/0044-Return-nether-portal-fix.patch b/patches/server/0043-Return-nether-portal-fix.patch similarity index 97% rename from patches/server/0044-Return-nether-portal-fix.patch rename to patches/server/0043-Return-nether-portal-fix.patch index 3206586d..f687bc16 100644 --- a/patches/server/0044-Return-nether-portal-fix.patch +++ b/patches/server/0043-Return-nether-portal-fix.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix) diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 850558feb4f54b99755f912fac24f001cc9f88e3..212c4bc00081348b2768c35e7d6350f955f68e59 100644 +index 55e8802526effaa30fbf7ae5a1b5db7929d668a7..cc51a2c43028e63fa4bcf6dadb7b5bc3d5a9f4bb 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -1437,6 +1437,21 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player imple @@ -61,7 +61,7 @@ index f5ea34249bde9ecc19fad0b1fda4f9775522c7a6..d2c98e0f8d2dfbc74180a82bdb53741c // Save player file again if they were disconnected diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index b531a0699f1ccbafbb26907edddd7ab8adce1718..efbac4dd85314cce550d4c8fa1836566012a7a0d 100644 +index 408700b2236b4e04baebe23b47e72722006e3e23..31504985a81b48dab5d999310019dbdb191eb2d5 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -260,7 +260,7 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -74,7 +74,7 @@ index b531a0699f1ccbafbb26907edddd7ab8adce1718..efbac4dd85314cce550d4c8fa1836566 @Nullable private DamageSource lastDamageSource; diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java -index ddab7de1d376e9e486e2f920174397ea8804aa29..73b6e6f24852370268bdcb0b06027daa119b5091 100644 +index 1722188fbfccd233625db540ddcaf646762fd023..08892ab4eb097abf1fce4a75613b49ce376a0a23 100644 --- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java +++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java @@ -172,7 +172,18 @@ public class NetherPortalBlock extends Block implements Portal { diff --git a/patches/server/0045-Appleskin-Protocol.patch b/patches/server/0044-Appleskin-Protocol.patch similarity index 100% rename from patches/server/0045-Appleskin-Protocol.patch rename to patches/server/0044-Appleskin-Protocol.patch diff --git a/patches/server/0046-Xaero-Map-Protocol.patch b/patches/server/0045-Xaero-Map-Protocol.patch similarity index 100% rename from patches/server/0046-Xaero-Map-Protocol.patch rename to patches/server/0045-Xaero-Map-Protocol.patch diff --git a/patches/server/0047-Leaves-Extra-Yggdrasil-Service.patch b/patches/server/0046-Leaves-Extra-Yggdrasil-Service.patch similarity index 100% rename from patches/server/0047-Leaves-Extra-Yggdrasil-Service.patch rename to patches/server/0046-Leaves-Extra-Yggdrasil-Service.patch diff --git a/patches/server/0048-Use-vanilla-random-config.patch b/patches/server/0047-Use-vanilla-random-config.patch similarity index 96% rename from patches/server/0048-Use-vanilla-random-config.patch rename to patches/server/0047-Use-vanilla-random-config.patch index cacae064..77f3ad5f 100644 --- a/patches/server/0048-Use-vanilla-random-config.patch +++ b/patches/server/0047-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 a95fd8164ddd2992525e1f453df2094ed2108cf7..ed5a96f4a4693cdbd081664fc7cc0774adf0319e 100644 +index 1beefbd05c13181214e188f50e88fb67f6712a45..012c638335ac54ffe1f780d2cd1e3a50243e33e9 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -558,7 +558,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 a2b9e996fa606d91b153979eefae8974f7ffdf4e..9b8991e562e83c0e3a29f868fa19690e4aa2d453 100644 +index 929a9bee808e8216dacb74dc58dbeee612126afe..9205d565f375a8177c6bc0c19e1f594d1d8cd0ed 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/patches/server/0049-Fix-update-suppression-crash.patch b/patches/server/0048-Fix-update-suppression-crash.patch similarity index 100% rename from patches/server/0049-Fix-update-suppression-crash.patch rename to patches/server/0048-Fix-update-suppression-crash.patch diff --git a/patches/server/0050-Bedrock-break-list.patch b/patches/server/0049-Bedrock-break-list.patch similarity index 100% rename from patches/server/0050-Bedrock-break-list.patch rename to patches/server/0049-Bedrock-break-list.patch diff --git a/patches/server/0051-Fix-trapdoor-feature.patch b/patches/server/0050-Fix-trapdoor-feature.patch similarity index 100% rename from patches/server/0051-Fix-trapdoor-feature.patch rename to patches/server/0050-Fix-trapdoor-feature.patch diff --git a/patches/server/0052-Disable-distance-check-for-UseItemOnPacket.patch b/patches/server/0051-Disable-distance-check-for-UseItemOnPacket.patch similarity index 100% rename from patches/server/0052-Disable-distance-check-for-UseItemOnPacket.patch rename to patches/server/0051-Disable-distance-check-for-UseItemOnPacket.patch diff --git a/patches/server/0053-No-feather-falling-trample.patch b/patches/server/0052-No-feather-falling-trample.patch similarity index 100% rename from patches/server/0053-No-feather-falling-trample.patch rename to patches/server/0052-No-feather-falling-trample.patch diff --git a/patches/server/0054-Syncmatica-Protocol.patch b/patches/server/0053-Syncmatica-Protocol.patch similarity index 100% rename from patches/server/0054-Syncmatica-Protocol.patch rename to patches/server/0053-Syncmatica-Protocol.patch diff --git a/patches/server/0055-Shared-villager-discounts.patch b/patches/server/0054-Shared-villager-discounts.patch similarity index 100% rename from patches/server/0055-Shared-villager-discounts.patch rename to patches/server/0054-Shared-villager-discounts.patch diff --git a/patches/server/0056-Redstone-wire-dont-connect-if-on-trapdoor.patch b/patches/server/0055-Redstone-wire-dont-connect-if-on-trapdoor.patch similarity index 100% rename from patches/server/0056-Redstone-wire-dont-connect-if-on-trapdoor.patch rename to patches/server/0055-Redstone-wire-dont-connect-if-on-trapdoor.patch diff --git a/patches/server/0057-Disable-check-out-of-order-command.patch b/patches/server/0056-Disable-check-out-of-order-command.patch similarity index 100% rename from patches/server/0057-Disable-check-out-of-order-command.patch rename to patches/server/0056-Disable-check-out-of-order-command.patch diff --git a/patches/server/0058-Despawn-enderman-with-block.patch b/patches/server/0057-Despawn-enderman-with-block.patch similarity index 100% rename from patches/server/0058-Despawn-enderman-with-block.patch rename to patches/server/0057-Despawn-enderman-with-block.patch diff --git a/patches/server/0059-Leaves-carpet-support.patch b/patches/server/0058-Leaves-carpet-support.patch similarity index 100% rename from patches/server/0059-Leaves-carpet-support.patch rename to patches/server/0058-Leaves-carpet-support.patch diff --git a/patches/server/0060-Creative-fly-no-clip.patch b/patches/server/0059-Creative-fly-no-clip.patch similarity index 100% rename from patches/server/0060-Creative-fly-no-clip.patch rename to patches/server/0059-Creative-fly-no-clip.patch diff --git a/patches/server/0061-Optimized-dragon-respawn.patch b/patches/server/0060-Optimized-dragon-respawn.patch similarity index 100% rename from patches/server/0061-Optimized-dragon-respawn.patch rename to patches/server/0060-Optimized-dragon-respawn.patch diff --git a/patches/server/0062-Shave-snow-layers.patch b/patches/server/0061-Shave-snow-layers.patch similarity index 100% rename from patches/server/0062-Shave-snow-layers.patch rename to patches/server/0061-Shave-snow-layers.patch diff --git a/patches/server/0063-Spawn-ignore-lc.patch b/patches/server/0062-Spawn-ignore-lc.patch similarity index 100% rename from patches/server/0063-Spawn-ignore-lc.patch rename to patches/server/0062-Spawn-ignore-lc.patch diff --git a/patches/server/0064-Elytra-aeronautics-no-chunk-load.patch b/patches/server/0063-Elytra-aeronautics-no-chunk-load.patch similarity index 96% rename from patches/server/0064-Elytra-aeronautics-no-chunk-load.patch rename to patches/server/0063-Elytra-aeronautics-no-chunk-load.patch index fa7d3242..4843579a 100644 --- a/patches/server/0064-Elytra-aeronautics-no-chunk-load.patch +++ b/patches/server/0063-Elytra-aeronautics-no-chunk-load.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Elytra aeronautics no chunk load diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index d9c36827706776e143fccd72b53c12a9ac455475..59c023076a7a64049ba478aa049f19103aeb70ee 100644 +index 5fe7ae8b873f71a0caf886e6036a4f58c835c4c2..0905615b8961793d57e5a3009e653f7af46e2007 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -749,7 +749,8 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -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 32d8d22f5e08f6ebdd06b5057fe1b0451acdf1f2..6556fc94295d66eec90492c051053bf24cc8ebd4 100644 +index f893f841509017d61b496e712c12b578d4d69345..e3b150807c04a487b9165f71ba9923e17568ba61 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 32d8d22f5e08f6ebdd06b5057fe1b0451acdf1f2..6556fc94295d66eec90492c051053bf2 !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 0f084a9906bd8b20f7b10e47647bfb1b6f7ef710..d6b90cc6e94d3e81a336cf15910a0c89e69fa96b 100644 +index 012c638335ac54ffe1f780d2cd1e3a50243e33e9..5a882339c89e55f29369ee013babf89afc5194ce 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/0065-Cache-ignite-odds.patch b/patches/server/0064-Cache-ignite-odds.patch similarity index 97% rename from patches/server/0065-Cache-ignite-odds.patch rename to patches/server/0064-Cache-ignite-odds.patch index cf2f04ba..9240607f 100644 --- a/patches/server/0065-Cache-ignite-odds.patch +++ b/patches/server/0064-Cache-ignite-odds.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache ignite odds diff --git a/src/main/java/net/minecraft/world/level/block/FireBlock.java b/src/main/java/net/minecraft/world/level/block/FireBlock.java -index 4d467ecf0dd8006b9fa4fb8fb5aadc0622a1e512..2a60644479cdc31cd08beff154864b6c39538649 100644 +index 0a77a470d78f68e8397f29f298e7f52fbd7ba9a2..3f82dd92c41519bd21b481f2303f03a12bb8f973 100644 --- a/src/main/java/net/minecraft/world/level/block/FireBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FireBlock.java @@ -220,6 +220,7 @@ public class FireBlock extends BaseFireBlock { diff --git a/patches/server/0066-Lava-riptide.patch b/patches/server/0065-Lava-riptide.patch similarity index 100% rename from patches/server/0066-Lava-riptide.patch rename to patches/server/0065-Lava-riptide.patch diff --git a/patches/server/0067-No-block-update-command.patch b/patches/server/0066-No-block-update-command.patch similarity index 100% rename from patches/server/0067-No-block-update-command.patch rename to patches/server/0066-No-block-update-command.patch diff --git a/patches/server/0068-Raider-die-skip-self-raid-check.patch b/patches/server/0067-Raider-die-skip-self-raid-check.patch similarity index 100% rename from patches/server/0068-Raider-die-skip-self-raid-check.patch rename to patches/server/0067-Raider-die-skip-self-raid-check.patch diff --git a/patches/server/0069-Container-open-passthrough.patch b/patches/server/0068-Container-open-passthrough.patch similarity index 100% rename from patches/server/0069-Container-open-passthrough.patch rename to patches/server/0068-Container-open-passthrough.patch diff --git a/patches/server/0070-SIMD-support.patch b/patches/server/0069-SIMD-support.patch similarity index 100% rename from patches/server/0070-SIMD-support.patch rename to patches/server/0069-SIMD-support.patch diff --git a/patches/server/0071-Dont-respond-ping-before-start-fully.patch b/patches/server/0070-Dont-respond-ping-before-start-fully.patch similarity index 100% rename from patches/server/0071-Dont-respond-ping-before-start-fully.patch rename to patches/server/0070-Dont-respond-ping-before-start-fully.patch diff --git a/patches/server/0072-Faster-chunk-serialization.patch b/patches/server/0071-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0072-Faster-chunk-serialization.patch rename to patches/server/0071-Faster-chunk-serialization.patch diff --git a/patches/server/0073-Cache-world-generator-sea-level.patch b/patches/server/0072-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0073-Cache-world-generator-sea-level.patch rename to patches/server/0072-Cache-world-generator-sea-level.patch diff --git a/patches/server/0074-Bladeren-Protocol.patch b/patches/server/0073-Bladeren-Protocol.patch similarity index 100% rename from patches/server/0074-Bladeren-Protocol.patch rename to patches/server/0073-Bladeren-Protocol.patch diff --git a/patches/server/0075-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0074-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0075-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0074-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0076-Bladeren-mspt-sync-protocol.patch b/patches/server/0075-Bladeren-mspt-sync-protocol.patch similarity index 100% rename from patches/server/0076-Bladeren-mspt-sync-protocol.patch rename to patches/server/0075-Bladeren-mspt-sync-protocol.patch diff --git a/patches/server/0077-Store-mob-counts-in-an-array.patch b/patches/server/0076-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0077-Store-mob-counts-in-an-array.patch rename to patches/server/0076-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0078-Cache-BlockStatePairKey-hash.patch b/patches/server/0077-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0078-Cache-BlockStatePairKey-hash.patch rename to patches/server/0077-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0079-Optimize-noise-generation.patch b/patches/server/0078-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0079-Optimize-noise-generation.patch rename to patches/server/0078-Optimize-noise-generation.patch diff --git a/patches/server/0080-Disable-packet-limit.patch b/patches/server/0079-Disable-packet-limit.patch similarity index 100% rename from patches/server/0080-Disable-packet-limit.patch rename to patches/server/0079-Disable-packet-limit.patch diff --git a/patches/server/0081-Reduce-array-allocations.patch b/patches/server/0080-Reduce-array-allocations.patch similarity index 99% rename from patches/server/0081-Reduce-array-allocations.patch rename to patches/server/0080-Reduce-array-allocations.patch index fe7a67c4..3e07941a 100644 --- a/patches/server/0081-Reduce-array-allocations.patch +++ b/patches/server/0080-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 b79d34a8cfbe562e53960062d8dd9e9e5156a9ed..1b33ac2eaa4d938f8e930fb2bfcc7169f10f851f 100644 +index 542531451c63392262fa81ec62ff7143e455e04c..64b63fe65f12d21e589c946c76e54f8f9fc8aeef 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 b79d34a8cfbe562e53960062d8dd9e9e5156a9ed..1b33ac2eaa4d938f8e930fb2bfcc7169 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 6556fc94295d66eec90492c051053bf24cc8ebd4..ec131f0041f9a2167f06a5fc85c2fd01f6062531 100644 +index e3b150807c04a487b9165f71ba9923e17568ba61..bfaec4b4dbe74b09e4c4e56268e38ce475304796 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; @@ -357,7 +357,7 @@ index 2fa2a4eef21e786f738f36616c3160defa95bce8..36c98f611f043ebadffd1b110ba3002b private EquipmentSlot(final EquipmentSlot.Type type, final int entityId, final int maxCount, final int armorStandId, final String name) { this.type = type; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index efbac4dd85314cce550d4c8fa1836566012a7a0d..a160a6b3a8634d142436ba4098da219cf4d825a8 100644 +index 31504985a81b48dab5d999310019dbdb191eb2d5..af8f8161b940afb1b77dee7cc2711e42738a6bed 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3280,7 +3280,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0082-Optimize-sun-burn-tick.patch b/patches/server/0081-Optimize-sun-burn-tick.patch similarity index 98% rename from patches/server/0082-Optimize-sun-burn-tick.patch rename to patches/server/0081-Optimize-sun-burn-tick.patch index b5d95551..2db3c4da 100644 --- a/patches/server/0082-Optimize-sun-burn-tick.patch +++ b/patches/server/0081-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 d6b90cc6e94d3e81a336cf15910a0c89e69fa96b..34610ab46a46a654742132ee35d3ec180d97d2ab 100644 +index 5a882339c89e55f29369ee013babf89afc5194ce..e5ead8e57e8c527e0906816b741db20b346880d1 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/patches/server/0083-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0083-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0082-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0084-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0083-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0084-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0083-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0085-Optimized-CubePointRange.patch b/patches/server/0084-Optimized-CubePointRange.patch similarity index 100% rename from patches/server/0085-Optimized-CubePointRange.patch rename to patches/server/0084-Optimized-CubePointRange.patch diff --git a/patches/server/0086-Check-frozen-ticks-before-landing-block.patch b/patches/server/0085-Check-frozen-ticks-before-landing-block.patch similarity index 93% rename from patches/server/0086-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0085-Check-frozen-ticks-before-landing-block.patch index c3569245..830a1c94 100644 --- a/patches/server/0086-Check-frozen-ticks-before-landing-block.patch +++ b/patches/server/0085-Check-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 a160a6b3a8634d142436ba4098da219cf4d825a8..fc6bbe34b6ff4912d34f86196c6d55d7116dcedb 100644 +index af8f8161b940afb1b77dee7cc2711e42738a6bed..c578497c824021e571b21b1b938705e7f585632c 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/patches/server/0087-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0086-Skip-entity-move-if-movement-is-zero.patch similarity index 95% rename from patches/server/0087-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0086-Skip-entity-move-if-movement-is-zero.patch index 84bef751..834b88c2 100644 --- a/patches/server/0087-Skip-entity-move-if-movement-is-zero.patch +++ b/patches/server/0086-Skip-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 381d145c3fd843c5ed0193fb704921f1ffd628ec..f6e23891418232a962c2ed0f25105a62c16e57b8 100644 +index e5ead8e57e8c527e0906816b741db20b346880d1..c19bd6fbf050f7552acd80fa0381a5b2a89dd433 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -323,6 +323,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0088-Skip-cloning-advancement-criteria.patch b/patches/server/0087-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0088-Skip-cloning-advancement-criteria.patch rename to patches/server/0087-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0089-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0088-Skip-negligible-planar-movement-multiplication.patch similarity index 95% rename from patches/server/0089-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0088-Skip-negligible-planar-movement-multiplication.patch index 0de034e2..426c76f3 100644 --- a/patches/server/0089-Skip-negligible-planar-movement-multiplication.patch +++ b/patches/server/0088-Skip-negligible-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 85afcaaa2fee449139e68cdc346738403edc0fdd..582d7221b8af8d96909cf240913168fc09c966c4 100644 +index c19bd6fbf050f7552acd80fa0381a5b2a89dd433..22f1ccd7f0055cc6d68803111666e2df59a54aa4 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/patches/server/0090-Fix-villagers-dont-release-memory.patch b/patches/server/0089-Fix-villagers-dont-release-memory.patch similarity index 100% rename from patches/server/0090-Fix-villagers-dont-release-memory.patch rename to patches/server/0089-Fix-villagers-dont-release-memory.patch diff --git a/patches/server/0091-Avoid-anvil-too-expensive.patch b/patches/server/0090-Avoid-anvil-too-expensive.patch similarity index 91% rename from patches/server/0091-Avoid-anvil-too-expensive.patch rename to patches/server/0090-Avoid-anvil-too-expensive.patch index a5971de2..29848677 100644 --- a/patches/server/0091-Avoid-anvil-too-expensive.patch +++ b/patches/server/0090-Avoid-anvil-too-expensive.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Avoid anvil too expensive diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -index 7198dc9ffc9a37dab3654e12aa497c442a9993c5..f81870bf7fb81d3c409971a35e5782c898ab547b 100644 +index d685511104ac552dfc9ae2111e1bfb60fa812102..f80e09d3105405ecc3c877d389633583e94690f1 100644 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java @@ -280,7 +280,7 @@ public class AnvilMenu extends ItemCombinerMenu { diff --git a/patches/server/0092-Bow-infinity-fix.patch b/patches/server/0091-Bow-infinity-fix.patch similarity index 100% rename from patches/server/0092-Bow-infinity-fix.patch rename to patches/server/0091-Bow-infinity-fix.patch diff --git a/patches/server/0093-Zero-tick-plants.patch b/patches/server/0092-Zero-tick-plants.patch similarity index 100% rename from patches/server/0093-Zero-tick-plants.patch rename to patches/server/0092-Zero-tick-plants.patch diff --git a/patches/server/0094-Leaves-Updater.patch b/patches/server/0093-Leaves-Updater.patch similarity index 100% rename from patches/server/0094-Leaves-Updater.patch rename to patches/server/0093-Leaves-Updater.patch diff --git a/patches/server/0095-Force-peaceful-mode-switch.patch b/patches/server/0094-Force-peaceful-mode-switch.patch similarity index 100% rename from patches/server/0095-Force-peaceful-mode-switch.patch rename to patches/server/0094-Force-peaceful-mode-switch.patch diff --git a/patches/server/0096-Replay-Mod-API.patch b/patches/server/0095-Replay-Mod-API.patch similarity index 99% rename from patches/server/0096-Replay-Mod-API.patch rename to patches/server/0095-Replay-Mod-API.patch index 60f4f5ab..a701767d 100644 --- a/patches/server/0096-Replay-Mod-API.patch +++ b/patches/server/0095-Replay-Mod-API.patch @@ -437,7 +437,7 @@ index 9c3df47ae65289c27a1d63ac06ca41c074ff374e..01d902e9fbf029fcd8aa21e541e54785 // Special case complex part, since there is no extra entity type for them if (entity instanceof EnderDragonPart complexPart) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 992437a6e838f653f32d33b5b3f702c484640a97..cc2bd9fd33070464bac8aeab9ff26543e7b57801 100644 +index a0d5082590ee03060f0dbb4770d196efc316c328..d85413bb9b6b7e60de97d084d27a457409ee4ddc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2243,7 +2243,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0097-Leaves-I18n.patch b/patches/server/0096-Leaves-I18n.patch similarity index 100% rename from patches/server/0097-Leaves-I18n.patch rename to patches/server/0096-Leaves-I18n.patch diff --git a/patches/server/0098-Fix-minecraft-hopper-not-work-without-player.patch b/patches/server/0097-Fix-minecraft-hopper-not-work-without-player.patch similarity index 100% rename from patches/server/0098-Fix-minecraft-hopper-not-work-without-player.patch rename to patches/server/0097-Fix-minecraft-hopper-not-work-without-player.patch diff --git a/patches/server/0099-RNG-Fishing.patch b/patches/server/0098-RNG-Fishing.patch similarity index 100% rename from patches/server/0099-RNG-Fishing.patch rename to patches/server/0098-RNG-Fishing.patch diff --git a/patches/server/0100-Wool-Hopper-Counter.patch b/patches/server/0099-Wool-Hopper-Counter.patch similarity index 100% rename from patches/server/0100-Wool-Hopper-Counter.patch rename to patches/server/0099-Wool-Hopper-Counter.patch diff --git a/patches/server/0101-Leaves-Reload-Command.patch b/patches/server/0100-Leaves-Reload-Command.patch similarity index 100% rename from patches/server/0101-Leaves-Reload-Command.patch rename to patches/server/0100-Leaves-Reload-Command.patch diff --git a/patches/server/0102-Spider-jockeys-drop-gapples.patch b/patches/server/0101-Spider-jockeys-drop-gapples.patch similarity index 100% rename from patches/server/0102-Spider-jockeys-drop-gapples.patch rename to patches/server/0101-Spider-jockeys-drop-gapples.patch diff --git a/patches/server/0103-Force-Void-Trade.patch b/patches/server/0102-Force-Void-Trade.patch similarity index 99% rename from patches/server/0103-Force-Void-Trade.patch rename to patches/server/0102-Force-Void-Trade.patch index a82dd48e..e9c3f7d0 100644 --- a/patches/server/0103-Force-Void-Trade.patch +++ b/patches/server/0102-Force-Void-Trade.patch @@ -119,7 +119,7 @@ index 0af34e0f9c9696fbcb11b12fb27472ef17ad532a..422d537014520383503f06e834ef6fb3 return InteractionResult.sidedSuccess(this.level().isClientSide); } else { diff --git a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java -index 2992e86f5f83431e230162380b33721df785ba91..7ec2ef906433d7e0164ce0e5ec62fef602ba6b37 100644 +index 5de2030452b96a4df7ce0be82f07e002db595dee..7c2b12fcc8028fc029af17e3bae2901843b47b62 100644 --- a/src/main/java/net/minecraft/world/inventory/MerchantMenu.java +++ b/src/main/java/net/minecraft/world/inventory/MerchantMenu.java @@ -27,7 +27,7 @@ public class MerchantMenu extends AbstractContainerMenu { diff --git a/patches/server/0104-Villager-infinite-discounts.patch b/patches/server/0103-Villager-infinite-discounts.patch similarity index 100% rename from patches/server/0104-Villager-infinite-discounts.patch rename to patches/server/0103-Villager-infinite-discounts.patch diff --git a/patches/server/0105-CCE-update-suppression.patch b/patches/server/0104-CCE-update-suppression.patch similarity index 100% rename from patches/server/0105-CCE-update-suppression.patch rename to patches/server/0104-CCE-update-suppression.patch diff --git a/patches/server/0106-Disable-offline-warn-if-use-proxy.patch b/patches/server/0105-Disable-offline-warn-if-use-proxy.patch similarity index 100% rename from patches/server/0106-Disable-offline-warn-if-use-proxy.patch rename to patches/server/0105-Disable-offline-warn-if-use-proxy.patch diff --git a/patches/server/0107-Disable-moved-wrongly-threshold.patch b/patches/server/0106-Disable-moved-wrongly-threshold.patch similarity index 100% rename from patches/server/0107-Disable-moved-wrongly-threshold.patch rename to patches/server/0106-Disable-moved-wrongly-threshold.patch diff --git a/patches/server/0108-Armor-stand-cant-kill-by-mob-projectile.patch b/patches/server/0107-Armor-stand-cant-kill-by-mob-projectile.patch similarity index 100% rename from patches/server/0108-Armor-stand-cant-kill-by-mob-projectile.patch rename to patches/server/0107-Armor-stand-cant-kill-by-mob-projectile.patch diff --git a/patches/server/0109-Make-Item-tick-vanilla.patch b/patches/server/0108-Make-Item-tick-vanilla.patch similarity index 92% rename from patches/server/0109-Make-Item-tick-vanilla.patch rename to patches/server/0108-Make-Item-tick-vanilla.patch index b760e3e1..4e4d3505 100644 --- a/patches/server/0109-Make-Item-tick-vanilla.patch +++ b/patches/server/0108-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 9b8991e562e83c0e3a29f868fa19690e4aa2d453..75001a1161a5c6dabd84c688424deadb87d3da67 100644 +index 9205d565f375a8177c6bc0c19e1f594d1d8cd0ed..1412cf425fb346e2b155f494d0867f1a06e1b3a1 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/patches/server/0110-Copper-Bulb-1-gt-delay.patch b/patches/server/0109-Copper-Bulb-1-gt-delay.patch similarity index 100% rename from patches/server/0110-Copper-Bulb-1-gt-delay.patch rename to patches/server/0109-Copper-Bulb-1-gt-delay.patch diff --git a/patches/server/0111-Crafter-1-gt-delay.patch b/patches/server/0110-Crafter-1-gt-delay.patch similarity index 100% rename from patches/server/0111-Crafter-1-gt-delay.patch rename to patches/server/0110-Crafter-1-gt-delay.patch diff --git a/patches/server/0112-Linear-region-file-format.patch b/patches/server/0111-Linear-region-file-format.patch similarity index 100% rename from patches/server/0112-Linear-region-file-format.patch rename to patches/server/0111-Linear-region-file-format.patch diff --git a/patches/server/0113-No-TNT-place-update.patch b/patches/server/0112-No-TNT-place-update.patch similarity index 100% rename from patches/server/0113-No-TNT-place-update.patch rename to patches/server/0112-No-TNT-place-update.patch diff --git a/patches/server/0114-Servux-Protocol.patch b/patches/server/0113-Servux-Protocol.patch similarity index 99% rename from patches/server/0114-Servux-Protocol.patch rename to patches/server/0113-Servux-Protocol.patch index 889a12ad..f362ae9d 100644 --- a/patches/server/0114-Servux-Protocol.patch +++ b/patches/server/0113-Servux-Protocol.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Servux Protocol diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java -index ab18bbf87dfc1455ed185a5152dad6d236565ecc..227c89f7d58cdcfad762f1f11e1f87203a444c6f 100644 +index a608f57ebca98eda88ad749d0aad021678be54f9..aea042e67daeacfb34bbb770bb267ef29921c517 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java @@ -412,7 +412,11 @@ public final class RegionizedPlayerChunkLoader { diff --git a/patches/server/0115-Placing-locked-hopper-no-longer-send-NC-updates.patch b/patches/server/0114-Placing-locked-hopper-no-longer-send-NC-updates.patch similarity index 100% rename from patches/server/0115-Placing-locked-hopper-no-longer-send-NC-updates.patch rename to patches/server/0114-Placing-locked-hopper-no-longer-send-NC-updates.patch diff --git a/patches/server/0116-Renewable-deepslate.patch b/patches/server/0115-Renewable-deepslate.patch similarity index 100% rename from patches/server/0116-Renewable-deepslate.patch rename to patches/server/0115-Renewable-deepslate.patch diff --git a/patches/server/0117-Renewable-sponges.patch b/patches/server/0116-Renewable-sponges.patch similarity index 100% rename from patches/server/0117-Renewable-sponges.patch rename to patches/server/0116-Renewable-sponges.patch diff --git a/patches/server/0118-Renewable-coral.patch b/patches/server/0117-Renewable-coral.patch similarity index 100% rename from patches/server/0118-Renewable-coral.patch rename to patches/server/0117-Renewable-coral.patch diff --git a/patches/server/0119-Fast-resume.patch b/patches/server/0118-Fast-resume.patch similarity index 100% rename from patches/server/0119-Fast-resume.patch rename to patches/server/0118-Fast-resume.patch diff --git a/patches/server/0120-Vanilla-hopper.patch b/patches/server/0119-Vanilla-hopper.patch similarity index 97% rename from patches/server/0120-Vanilla-hopper.patch rename to patches/server/0119-Vanilla-hopper.patch index d8a54769..30fd7f8b 100644 --- a/patches/server/0120-Vanilla-hopper.patch +++ b/patches/server/0119-Vanilla-hopper.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Vanilla hopper This is a temporary solution designed to attempt to restore the vanilla behavior of the funnel while preserving optimizations as much as possible. It should ultimately be replaced by the optimization solution provided by lithium. diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java -index 6642ddce7bf66cd6ca88fa46b0f20cd63c5c258f..34797dd4b7ebf12b236a21026ca7869bc4cc4b5a 100644 +index 9cc932fb547686db7c06f7ef29e3b07b2e755982..134245c3b48162c603ca032e8fc0d4b7f0bc3637 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java @@ -305,36 +305,49 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen diff --git a/patches/server/0121-Force-minecraft-command.patch b/patches/server/0120-Force-minecraft-command.patch similarity index 100% rename from patches/server/0121-Force-minecraft-command.patch rename to patches/server/0120-Force-minecraft-command.patch diff --git a/patches/server/0122-Fix-falling-block-s-block-location.patch b/patches/server/0121-Fix-falling-block-s-block-location.patch similarity index 92% rename from patches/server/0122-Fix-falling-block-s-block-location.patch rename to patches/server/0121-Fix-falling-block-s-block-location.patch index 8c665fbc..29f0cd4a 100644 --- a/patches/server/0122-Fix-falling-block-s-block-location.patch +++ b/patches/server/0121-Fix-falling-block-s-block-location.patch @@ -5,7 +5,7 @@ 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 582d7221b8af8d96909cf240913168fc09c966c4..ef01ecfb6f13e2991bf71b447b833c01f3c89abd 100644 +index 22f1ccd7f0055cc6d68803111666e2df59a54aa4..99ad282dcc026b45cbe5b4af22db3da02e837d10 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -4751,6 +4751,14 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess diff --git a/patches/server/0123-Fix-NPE-during-creating-GUI-graph.patch b/patches/server/0122-Fix-NPE-during-creating-GUI-graph.patch similarity index 100% rename from patches/server/0123-Fix-NPE-during-creating-GUI-graph.patch rename to patches/server/0122-Fix-NPE-during-creating-GUI-graph.patch diff --git a/patches/server/0124-Bytebuf-API.patch b/patches/server/0123-Bytebuf-API.patch similarity index 99% rename from patches/server/0124-Bytebuf-API.patch rename to patches/server/0123-Bytebuf-API.patch index 4e9a59a7..18cbf4ad 100644 --- a/patches/server/0124-Bytebuf-API.patch +++ b/patches/server/0123-Bytebuf-API.patch @@ -35,7 +35,7 @@ index d04ebc381ba3f52954b647bc76ccc9cf628052eb..bcd2aa65470caee707209d717c2e50f5 // Leaves start - bot support diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 325b429b6030bccd1f22fbf488a9a07657084545..064a9705c161154d6bae94f85b1ff45cf94070b1 100644 +index b759025019120a0029c46506f1eede4eb85d7550..54f4e67dcc51fbf2fb4c6471682d9b032bd7cfbe 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -312,6 +312,7 @@ public final class CraftServer implements Server { @@ -63,7 +63,7 @@ index 325b429b6030bccd1f22fbf488a9a07657084545..064a9705c161154d6bae94f85b1ff45c + // Leaves end - Bytebuf API } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cc2bd9fd33070464bac8aeab9ff26543e7b57801..32f246acbdca8836b8e75e31e26a5407fd394714 100644 +index d85413bb9b6b7e60de97d084d27a457409ee4ddc..f3c0dc934b08721243e0ce331e7243059007a3fd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3554,4 +3554,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0125-Allow-grindstone-overstacking.patch b/patches/server/0124-Allow-grindstone-overstacking.patch similarity index 100% rename from patches/server/0125-Allow-grindstone-overstacking.patch rename to patches/server/0124-Allow-grindstone-overstacking.patch diff --git a/patches/server/0126-Configurable-MC-67.patch b/patches/server/0125-Configurable-MC-67.patch similarity index 92% rename from patches/server/0126-Configurable-MC-67.patch rename to patches/server/0125-Configurable-MC-67.patch index 70aef80c..dc32acdb 100644 --- a/patches/server/0126-Configurable-MC-67.patch +++ b/patches/server/0125-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 ef01ecfb6f13e2991bf71b447b833c01f3c89abd..c16a4f9f4dfc05786f1baab0318a65245f920a72 100644 +index 99ad282dcc026b45cbe5b4af22db3da02e837d10..b5f35946cf60cc37eaa0d9242579dc74c3f3b93a 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/patches/server/0127-Disable-end-gateway-portal-entity-ticking.patch b/patches/server/0126-Disable-end-gateway-portal-entity-ticking.patch similarity index 100% rename from patches/server/0127-Disable-end-gateway-portal-entity-ticking.patch rename to patches/server/0126-Disable-end-gateway-portal-entity-ticking.patch diff --git a/patches/server/0128-Disable-crystal-portal-proximity-check.patch b/patches/server/0127-Disable-crystal-portal-proximity-check.patch similarity index 100% rename from patches/server/0128-Disable-crystal-portal-proximity-check.patch rename to patches/server/0127-Disable-crystal-portal-proximity-check.patch diff --git a/patches/server/0129-Can-disable-LivingEntity-aiStep-alive-check.patch b/patches/server/0128-Can-disable-LivingEntity-aiStep-alive-check.patch similarity index 89% rename from patches/server/0129-Can-disable-LivingEntity-aiStep-alive-check.patch rename to patches/server/0128-Can-disable-LivingEntity-aiStep-alive-check.patch index d31c824e..22a3c70a 100644 --- a/patches/server/0129-Can-disable-LivingEntity-aiStep-alive-check.patch +++ b/patches/server/0128-Can-disable-LivingEntity-aiStep-alive-check.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Can disable LivingEntity aiStep alive check diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index fc6bbe34b6ff4912d34f86196c6d55d7116dcedb..be817a51324c81d8adfe73b0977bc5afc0f359d4 100644 +index c578497c824021e571b21b1b938705e7f585632c..0730c2a7fe66e38b71df15050b17d2acb6b47251 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3193,7 +3193,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0130-Leaves-plugins.patch b/patches/server/0129-Leaves-plugins.patch similarity index 100% rename from patches/server/0130-Leaves-plugins.patch rename to patches/server/0129-Leaves-plugins.patch diff --git a/patches/server/0131-Fix-fortress-mob-spawn.patch b/patches/server/0130-Fix-fortress-mob-spawn.patch similarity index 100% rename from patches/server/0131-Fix-fortress-mob-spawn.patch rename to patches/server/0130-Fix-fortress-mob-spawn.patch diff --git a/patches/server/0132-Fix-FallingBlockEntity-Duplicate.patch b/patches/server/0131-Fix-FallingBlockEntity-Duplicate.patch similarity index 100% rename from patches/server/0132-Fix-FallingBlockEntity-Duplicate.patch rename to patches/server/0131-Fix-FallingBlockEntity-Duplicate.patch diff --git a/patches/server/0133-Old-BlockEntity-behaviour.patch b/patches/server/0132-Old-BlockEntity-behaviour.patch similarity index 100% rename from patches/server/0133-Old-BlockEntity-behaviour.patch rename to patches/server/0132-Old-BlockEntity-behaviour.patch