From 7d09a3a0fb96ccba5e5a88352b40931d3e5ac978 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Thu, 25 Jul 2024 14:56:09 +0800 Subject: [PATCH] Fix #276 and #277 --- ...ce-entity-fluid-lookups-if-no-fluids.patch | 0 ...> 0032-Reduce-chunk-loading-lookups.patch} | 0 ...33-InstantBlockUpdater-Reintroduced.patch} | 0 ...dom-flatten-triangular-distribution.patch} | 0 ...rotocol.patch => 0035-BBOR-Protocol.patch} | 0 ...col.patch => 0036-PCA-sync-protocol.patch} | 0 ...rotocol.patch => 0037-Jade-Protocol.patch} | 0 ...lternative-block-placement-Protocol.patch} | 0 ...ch => 0039-Player-operation-limiter.patch} | 0 ...ytra.patch => 0040-Renewable-Elytra.patch} | 0 ...atch => 0041-Stackable-ShulkerBoxes.patch} | 0 ...042-Improve-fluid-direction-caching.patch} | 0 ... => 0043-MC-Technical-Survival-Mode.patch} | 0 ...ch => 0044-Return-nether-portal-fix.patch} | 0 ...ol.patch => 0045-Appleskin-Protocol.patch} | 0 ...ol.patch => 0046-Xaero-Map-Protocol.patch} | 0 ...0047-Leaves-Extra-Yggdrasil-Service.patch} | 2 +- ...h => 0048-Use-vanilla-random-config.patch} | 4 ++-- ...> 0049-Fix-update-suppression-crash.patch} | 0 ...st.patch => 0050-Bedrock-break-list.patch} | 0 ....patch => 0051-Fix-trapdoor-feature.patch} | 0 ...-distance-check-for-UseItemOnPacket.patch} | 2 +- ... => 0053-No-feather-falling-trample.patch} | 0 ...l.patch => 0054-Syncmatica-Protocol.patch} | 2 +- ...h => 0055-Shared-villager-discounts.patch} | 0 ...ne-wire-dont-connect-if-on-trapdoor.patch} | 0 ...-Disable-check-out-of-order-command.patch} | 0 ...=> 0058-Despawn-enderman-with-block.patch} | 0 ...patch => 0059-Leaves-carpet-support.patch} | 0 ....patch => 0060-Creative-fly-no-clip.patch} | 0 ...ch => 0061-Optimized-dragon-respawn.patch} | 0 ...ers.patch => 0062-Shave-snow-layers.patch} | 0 ...re-lc.patch => 0063-Spawn-ignore-lc.patch} | 2 +- ...64-Elytra-aeronautics-no-chunk-load.patch} | 4 ++-- ...dds.patch => 0065-Cache-ignite-odds.patch} | 0 ...-riptide.patch => 0066-Lava-riptide.patch} | 0 ...tch => 0067-No-block-update-command.patch} | 0 ...068-Raider-die-skip-self-raid-check.patch} | 0 ... => 0069-Container-open-passthrough.patch} | 0 ...-support.patch => 0070-SIMD-support.patch} | 0 ...ont-respond-ping-before-start-fully.patch} | 0 ... => 0072-Faster-chunk-serialization.patch} | 0 ...073-Cache-world-generator-sea-level.patch} | 0 ...col.patch => 0074-Bladeren-Protocol.patch} | 0 ...Skip-secondary-POI-sensor-if-absent.patch} | 0 ...=> 0076-Bladeren-mspt-sync-protocol.patch} | 0 ...> 0077-Store-mob-counts-in-an-array.patch} | 0 ...> 0078-Cache-BlockStatePairKey-hash.patch} | 0 ...h => 0079-Optimize-noise-generation.patch} | 0 ....patch => 0080-Disable-packet-limit.patch} | 0 ...ch => 0081-Reduce-array-allocations.patch} | 4 ++-- ...atch => 0082-Optimize-sun-burn-tick.patch} | 2 +- ...-Optional-allocation-in-EntityBased.patch} | 0 ...ignableFrom-call-in-ClassInstanceMu.patch} | 0 ...ch => 0085-Optimized-CubePointRange.patch} | 0 ...k-frozen-ticks-before-landing-block.patch} | 2 +- ...kip-entity-move-if-movement-is-zero.patch} | 2 +- ...8-Skip-cloning-advancement-criteria.patch} | 0 ...ible-planar-movement-multiplication.patch} | 2 +- ...0-Fix-villagers-dont-release-memory.patch} | 0 ...h => 0091-Avoid-anvil-too-expensive.patch} | 0 patches/server/0092-Bow-infinity-fix.patch | 19 ++++++++++++++++++ patches/server/0093-Bow-infinity-fix.patch | 20 ------------------- ...ants.patch => 0093-Zero-tick-plants.patch} | 0 ...pdater.patch => 0094-Leaves-Updater.patch} | 0 ... => 0095-Force-peaceful-mode-switch.patch} | 0 ...od-API.patch => 0096-Replay-Mod-API.patch} | 0 ...aves-I18n.patch => 0097-Leaves-I18n.patch} | 0 ...raft-hopper-not-work-without-player.patch} | 0 ...G-Fishing.patch => 0099-RNG-Fishing.patch} | 0 ...r.patch => 0100-Wool-Hopper-Counter.patch} | 0 ...patch => 0101-Leaves-Reload-Command.patch} | 0 ...=> 0102-Spider-jockeys-drop-gapples.patch} | 0 ...rade.patch => 0103-Force-Void-Trade.patch} | 0 ...=> 0104-Villager-infinite-discounts.patch} | 0 ...atch => 0105-CCE-update-suppression.patch} | 0 ...6-Disable-offline-warn-if-use-proxy.patch} | 0 ...107-Disable-moved-wrongly-threshold.patch} | 2 +- ...r-stand-cant-kill-by-mob-projectile.patch} | 0 ...atch => 0109-Make-Item-tick-vanilla.patch} | 2 +- ...atch => 0110-Copper-Bulb-1-gt-delay.patch} | 0 ...ay.patch => 0111-Crafter-1-gt-delay.patch} | 2 +- ...h => 0112-Linear-region-file-format.patch} | 2 +- ...e.patch => 0113-No-TNT-place-update.patch} | 0 ...tocol.patch => 0114-Servux-Protocol.patch} | 0 ...ed-hopper-no-longer-send-NC-updates.patch} | 0 ...e.patch => 0116-Renewable-deepslate.patch} | 0 ...ges.patch => 0117-Renewable-sponges.patch} | 0 ...coral.patch => 0118-Renewable-coral.patch} | 0 ...st-resume.patch => 0119-Fast-resume.patch} | 0 ...hopper.patch => 0120-Vanilla-hopper.patch} | 0 ...tch => 0121-Force-minecraft-command.patch} | 0 ...-Fix-falling-block-s-block-location.patch} | 4 ++-- ...3-Fix-NPE-during-creating-GUI-graph.patch} | 0 ...tebuf-API.patch => 0124-Bytebuf-API.patch} | 0 ... 0125-Allow-grindstone-overstacking.patch} | 0 ...67.patch => 0126-Configurable-MC-67.patch} | 2 +- ...e-end-gateway-portal-entity-ticking.patch} | 0 ...able-crystal-portal-proximity-check.patch} | 0 ...ble-LivingEntity-aiStep-alive-check.patch} | 0 ...lugins.patch => 0130-Leaves-plugins.patch} | 0 101 files changed, 40 insertions(+), 41 deletions(-) rename patches/{ => removed}/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch (100%) rename patches/server/{0033-Reduce-chunk-loading-lookups.patch => 0032-Reduce-chunk-loading-lookups.patch} (100%) rename patches/server/{0034-InstantBlockUpdater-Reintroduced.patch => 0033-InstantBlockUpdater-Reintroduced.patch} (100%) rename patches/server/{0035-Random-flatten-triangular-distribution.patch => 0034-Random-flatten-triangular-distribution.patch} (100%) rename patches/server/{0036-BBOR-Protocol.patch => 0035-BBOR-Protocol.patch} (100%) rename patches/server/{0037-PCA-sync-protocol.patch => 0036-PCA-sync-protocol.patch} (100%) rename patches/server/{0038-Jade-Protocol.patch => 0037-Jade-Protocol.patch} (100%) rename patches/server/{0039-Alternative-block-placement-Protocol.patch => 0038-Alternative-block-placement-Protocol.patch} (100%) rename patches/server/{0040-Player-operation-limiter.patch => 0039-Player-operation-limiter.patch} (100%) rename patches/server/{0041-Renewable-Elytra.patch => 0040-Renewable-Elytra.patch} (100%) rename patches/server/{0042-Stackable-ShulkerBoxes.patch => 0041-Stackable-ShulkerBoxes.patch} (100%) rename patches/server/{0043-Improve-fluid-direction-caching.patch => 0042-Improve-fluid-direction-caching.patch} (100%) rename patches/server/{0044-MC-Technical-Survival-Mode.patch => 0043-MC-Technical-Survival-Mode.patch} (100%) rename patches/server/{0045-Return-nether-portal-fix.patch => 0044-Return-nether-portal-fix.patch} (100%) rename patches/server/{0046-Appleskin-Protocol.patch => 0045-Appleskin-Protocol.patch} (100%) rename patches/server/{0047-Xaero-Map-Protocol.patch => 0046-Xaero-Map-Protocol.patch} (100%) rename patches/server/{0048-Leaves-Extra-Yggdrasil-Service.patch => 0047-Leaves-Extra-Yggdrasil-Service.patch} (99%) rename patches/server/{0049-Use-vanilla-random-config.patch => 0048-Use-vanilla-random-config.patch} (96%) rename patches/server/{0050-Fix-update-suppression-crash.patch => 0049-Fix-update-suppression-crash.patch} (100%) rename patches/server/{0051-Bedrock-break-list.patch => 0050-Bedrock-break-list.patch} (100%) rename patches/server/{0052-Fix-trapdoor-feature.patch => 0051-Fix-trapdoor-feature.patch} (100%) rename patches/server/{0053-Disable-distance-check-for-UseItemOnPacket.patch => 0052-Disable-distance-check-for-UseItemOnPacket.patch} (92%) rename patches/server/{0054-No-feather-falling-trample.patch => 0053-No-feather-falling-trample.patch} (100%) rename patches/server/{0055-Syncmatica-Protocol.patch => 0054-Syncmatica-Protocol.patch} (99%) rename patches/server/{0056-Shared-villager-discounts.patch => 0055-Shared-villager-discounts.patch} (100%) rename patches/server/{0057-Redstone-wire-dont-connect-if-on-trapdoor.patch => 0056-Redstone-wire-dont-connect-if-on-trapdoor.patch} (100%) rename patches/server/{0058-Disable-check-out-of-order-command.patch => 0057-Disable-check-out-of-order-command.patch} (100%) rename patches/server/{0059-Despawn-enderman-with-block.patch => 0058-Despawn-enderman-with-block.patch} (100%) rename patches/server/{0060-Leaves-carpet-support.patch => 0059-Leaves-carpet-support.patch} (100%) rename patches/server/{0061-Creative-fly-no-clip.patch => 0060-Creative-fly-no-clip.patch} (100%) rename patches/server/{0062-Optimized-dragon-respawn.patch => 0061-Optimized-dragon-respawn.patch} (100%) rename patches/server/{0063-Shave-snow-layers.patch => 0062-Shave-snow-layers.patch} (100%) rename patches/server/{0064-Spawn-ignore-lc.patch => 0063-Spawn-ignore-lc.patch} (96%) rename patches/server/{0065-Elytra-aeronautics-no-chunk-load.patch => 0064-Elytra-aeronautics-no-chunk-load.patch} (97%) rename patches/server/{0066-Cache-ignite-odds.patch => 0065-Cache-ignite-odds.patch} (100%) rename patches/server/{0067-Lava-riptide.patch => 0066-Lava-riptide.patch} (100%) rename patches/server/{0068-No-block-update-command.patch => 0067-No-block-update-command.patch} (100%) rename patches/server/{0069-Raider-die-skip-self-raid-check.patch => 0068-Raider-die-skip-self-raid-check.patch} (100%) rename patches/server/{0070-Container-open-passthrough.patch => 0069-Container-open-passthrough.patch} (100%) rename patches/server/{0071-SIMD-support.patch => 0070-SIMD-support.patch} (100%) rename patches/server/{0072-Dont-respond-ping-before-start-fully.patch => 0071-Dont-respond-ping-before-start-fully.patch} (100%) rename patches/server/{0073-Faster-chunk-serialization.patch => 0072-Faster-chunk-serialization.patch} (100%) rename patches/server/{0074-Cache-world-generator-sea-level.patch => 0073-Cache-world-generator-sea-level.patch} (100%) rename patches/server/{0075-Bladeren-Protocol.patch => 0074-Bladeren-Protocol.patch} (100%) rename patches/server/{0076-Skip-secondary-POI-sensor-if-absent.patch => 0075-Skip-secondary-POI-sensor-if-absent.patch} (100%) rename patches/server/{0077-Bladeren-mspt-sync-protocol.patch => 0076-Bladeren-mspt-sync-protocol.patch} (100%) rename patches/server/{0078-Store-mob-counts-in-an-array.patch => 0077-Store-mob-counts-in-an-array.patch} (100%) rename patches/server/{0079-Cache-BlockStatePairKey-hash.patch => 0078-Cache-BlockStatePairKey-hash.patch} (100%) rename patches/server/{0080-Optimize-noise-generation.patch => 0079-Optimize-noise-generation.patch} (100%) rename patches/server/{0081-Disable-packet-limit.patch => 0080-Disable-packet-limit.patch} (100%) rename patches/server/{0082-Reduce-array-allocations.patch => 0081-Reduce-array-allocations.patch} (99%) rename patches/server/{0083-Optimize-sun-burn-tick.patch => 0082-Optimize-sun-burn-tick.patch} (98%) rename patches/server/{0084-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch => 0083-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch} (100%) rename patches/server/{0085-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch => 0084-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch} (100%) rename patches/server/{0086-Optimized-CubePointRange.patch => 0085-Optimized-CubePointRange.patch} (100%) rename patches/server/{0087-Check-frozen-ticks-before-landing-block.patch => 0086-Check-frozen-ticks-before-landing-block.patch} (93%) rename patches/server/{0088-Skip-entity-move-if-movement-is-zero.patch => 0087-Skip-entity-move-if-movement-is-zero.patch} (95%) rename patches/server/{0089-Skip-cloning-advancement-criteria.patch => 0088-Skip-cloning-advancement-criteria.patch} (100%) rename patches/server/{0090-Skip-negligible-planar-movement-multiplication.patch => 0089-Skip-negligible-planar-movement-multiplication.patch} (95%) rename patches/server/{0091-Fix-villagers-dont-release-memory.patch => 0090-Fix-villagers-dont-release-memory.patch} (100%) rename patches/server/{0092-Avoid-anvil-too-expensive.patch => 0091-Avoid-anvil-too-expensive.patch} (100%) create mode 100644 patches/server/0092-Bow-infinity-fix.patch delete mode 100644 patches/server/0093-Bow-infinity-fix.patch rename patches/server/{0094-Zero-tick-plants.patch => 0093-Zero-tick-plants.patch} (100%) rename patches/server/{0095-Leaves-Updater.patch => 0094-Leaves-Updater.patch} (100%) rename patches/server/{0096-Force-peaceful-mode-switch.patch => 0095-Force-peaceful-mode-switch.patch} (100%) rename patches/server/{0097-Replay-Mod-API.patch => 0096-Replay-Mod-API.patch} (100%) rename patches/server/{0098-Leaves-I18n.patch => 0097-Leaves-I18n.patch} (100%) rename patches/server/{0099-Fix-minecraft-hopper-not-work-without-player.patch => 0098-Fix-minecraft-hopper-not-work-without-player.patch} (100%) rename patches/server/{0100-RNG-Fishing.patch => 0099-RNG-Fishing.patch} (100%) rename patches/server/{0101-Wool-Hopper-Counter.patch => 0100-Wool-Hopper-Counter.patch} (100%) rename patches/server/{0102-Leaves-Reload-Command.patch => 0101-Leaves-Reload-Command.patch} (100%) rename patches/server/{0103-Spider-jockeys-drop-gapples.patch => 0102-Spider-jockeys-drop-gapples.patch} (100%) rename patches/server/{0104-Force-Void-Trade.patch => 0103-Force-Void-Trade.patch} (100%) rename patches/server/{0105-Villager-infinite-discounts.patch => 0104-Villager-infinite-discounts.patch} (100%) rename patches/server/{0106-CCE-update-suppression.patch => 0105-CCE-update-suppression.patch} (100%) rename patches/server/{0107-Disable-offline-warn-if-use-proxy.patch => 0106-Disable-offline-warn-if-use-proxy.patch} (100%) rename patches/server/{0108-Disable-moved-wrongly-threshold.patch => 0107-Disable-moved-wrongly-threshold.patch} (97%) rename patches/server/{0109-Armor-stand-cant-kill-by-mob-projectile.patch => 0108-Armor-stand-cant-kill-by-mob-projectile.patch} (100%) rename patches/server/{0110-Make-Item-tick-vanilla.patch => 0109-Make-Item-tick-vanilla.patch} (92%) rename patches/server/{0111-Copper-Bulb-1-gt-delay.patch => 0110-Copper-Bulb-1-gt-delay.patch} (100%) rename patches/server/{0112-Crafter-1-gt-delay.patch => 0111-Crafter-1-gt-delay.patch} (93%) rename patches/server/{0113-Linear-region-file-format.patch => 0112-Linear-region-file-format.patch} (99%) rename patches/server/{0114-No-TNT-place-update.patch => 0113-No-TNT-place-update.patch} (100%) rename patches/server/{0115-Servux-Protocol.patch => 0114-Servux-Protocol.patch} (100%) rename patches/server/{0116-Placing-locked-hopper-no-longer-send-NC-updates.patch => 0115-Placing-locked-hopper-no-longer-send-NC-updates.patch} (100%) rename patches/server/{0117-Renewable-deepslate.patch => 0116-Renewable-deepslate.patch} (100%) rename patches/server/{0118-Renewable-sponges.patch => 0117-Renewable-sponges.patch} (100%) rename patches/server/{0119-Renewable-coral.patch => 0118-Renewable-coral.patch} (100%) rename patches/server/{0120-Fast-resume.patch => 0119-Fast-resume.patch} (100%) rename patches/server/{0121-Vanilla-hopper.patch => 0120-Vanilla-hopper.patch} (100%) rename patches/server/{0122-Force-minecraft-command.patch => 0121-Force-minecraft-command.patch} (100%) rename patches/server/{0123-Fix-falling-block-s-block-location.patch => 0122-Fix-falling-block-s-block-location.patch} (87%) rename patches/server/{0124-Fix-NPE-during-creating-GUI-graph.patch => 0123-Fix-NPE-during-creating-GUI-graph.patch} (100%) rename patches/server/{0125-Bytebuf-API.patch => 0124-Bytebuf-API.patch} (100%) rename patches/server/{0126-Allow-grindstone-overstacking.patch => 0125-Allow-grindstone-overstacking.patch} (100%) rename patches/server/{0127-Configurable-MC-67.patch => 0126-Configurable-MC-67.patch} (92%) rename patches/server/{0128-Disable-end-gateway-portal-entity-ticking.patch => 0127-Disable-end-gateway-portal-entity-ticking.patch} (100%) rename patches/server/{0129-Disable-crystal-portal-proximity-check.patch => 0128-Disable-crystal-portal-proximity-check.patch} (100%) rename patches/server/{0130-Can-disable-LivingEntity-aiStep-alive-check.patch => 0129-Can-disable-LivingEntity-aiStep-alive-check.patch} (100%) rename patches/server/{0131-Leaves-plugins.patch => 0130-Leaves-plugins.patch} (100%) diff --git a/patches/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/removed/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch similarity index 100% rename from patches/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch rename to patches/removed/server/0032-Reduce-entity-fluid-lookups-if-no-fluids.patch diff --git a/patches/server/0033-Reduce-chunk-loading-lookups.patch b/patches/server/0032-Reduce-chunk-loading-lookups.patch similarity index 100% rename from patches/server/0033-Reduce-chunk-loading-lookups.patch rename to patches/server/0032-Reduce-chunk-loading-lookups.patch diff --git a/patches/server/0034-InstantBlockUpdater-Reintroduced.patch b/patches/server/0033-InstantBlockUpdater-Reintroduced.patch similarity index 100% rename from patches/server/0034-InstantBlockUpdater-Reintroduced.patch rename to patches/server/0033-InstantBlockUpdater-Reintroduced.patch diff --git a/patches/server/0035-Random-flatten-triangular-distribution.patch b/patches/server/0034-Random-flatten-triangular-distribution.patch similarity index 100% rename from patches/server/0035-Random-flatten-triangular-distribution.patch rename to patches/server/0034-Random-flatten-triangular-distribution.patch diff --git a/patches/server/0036-BBOR-Protocol.patch b/patches/server/0035-BBOR-Protocol.patch similarity index 100% rename from patches/server/0036-BBOR-Protocol.patch rename to patches/server/0035-BBOR-Protocol.patch diff --git a/patches/server/0037-PCA-sync-protocol.patch b/patches/server/0036-PCA-sync-protocol.patch similarity index 100% rename from patches/server/0037-PCA-sync-protocol.patch rename to patches/server/0036-PCA-sync-protocol.patch diff --git a/patches/server/0038-Jade-Protocol.patch b/patches/server/0037-Jade-Protocol.patch similarity index 100% rename from patches/server/0038-Jade-Protocol.patch rename to patches/server/0037-Jade-Protocol.patch diff --git a/patches/server/0039-Alternative-block-placement-Protocol.patch b/patches/server/0038-Alternative-block-placement-Protocol.patch similarity index 100% rename from patches/server/0039-Alternative-block-placement-Protocol.patch rename to patches/server/0038-Alternative-block-placement-Protocol.patch diff --git a/patches/server/0040-Player-operation-limiter.patch b/patches/server/0039-Player-operation-limiter.patch similarity index 100% rename from patches/server/0040-Player-operation-limiter.patch rename to patches/server/0039-Player-operation-limiter.patch diff --git a/patches/server/0041-Renewable-Elytra.patch b/patches/server/0040-Renewable-Elytra.patch similarity index 100% rename from patches/server/0041-Renewable-Elytra.patch rename to patches/server/0040-Renewable-Elytra.patch diff --git a/patches/server/0042-Stackable-ShulkerBoxes.patch b/patches/server/0041-Stackable-ShulkerBoxes.patch similarity index 100% rename from patches/server/0042-Stackable-ShulkerBoxes.patch rename to patches/server/0041-Stackable-ShulkerBoxes.patch diff --git a/patches/server/0043-Improve-fluid-direction-caching.patch b/patches/server/0042-Improve-fluid-direction-caching.patch similarity index 100% rename from patches/server/0043-Improve-fluid-direction-caching.patch rename to patches/server/0042-Improve-fluid-direction-caching.patch diff --git a/patches/server/0044-MC-Technical-Survival-Mode.patch b/patches/server/0043-MC-Technical-Survival-Mode.patch similarity index 100% rename from patches/server/0044-MC-Technical-Survival-Mode.patch rename to patches/server/0043-MC-Technical-Survival-Mode.patch diff --git a/patches/server/0045-Return-nether-portal-fix.patch b/patches/server/0044-Return-nether-portal-fix.patch similarity index 100% rename from patches/server/0045-Return-nether-portal-fix.patch rename to patches/server/0044-Return-nether-portal-fix.patch diff --git a/patches/server/0046-Appleskin-Protocol.patch b/patches/server/0045-Appleskin-Protocol.patch similarity index 100% rename from patches/server/0046-Appleskin-Protocol.patch rename to patches/server/0045-Appleskin-Protocol.patch diff --git a/patches/server/0047-Xaero-Map-Protocol.patch b/patches/server/0046-Xaero-Map-Protocol.patch similarity index 100% rename from patches/server/0047-Xaero-Map-Protocol.patch rename to patches/server/0046-Xaero-Map-Protocol.patch diff --git a/patches/server/0048-Leaves-Extra-Yggdrasil-Service.patch b/patches/server/0047-Leaves-Extra-Yggdrasil-Service.patch similarity index 99% rename from patches/server/0048-Leaves-Extra-Yggdrasil-Service.patch rename to patches/server/0047-Leaves-Extra-Yggdrasil-Service.patch index c293fc73..bf893552 100644 --- a/patches/server/0048-Leaves-Extra-Yggdrasil-Service.patch +++ b/patches/server/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 +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 deleted file mode 100644 index d1fb8b04..00000000 --- a/patches/server/0093-Bow-infinity-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: violetc <58360096+s-yh-china@users.noreply.github.com> -Date: Mon, 24 Jul 2023 15:54:18 +0800 -Subject: [PATCH] Bow infinity fix - - -diff --git a/src/main/java/net/minecraft/world/item/BowItem.java b/src/main/java/net/minecraft/world/item/BowItem.java -index 6eb5c0f23d9dc61e69ad5ad493c89602a9dcd4b5..7a5073539a451d31a89dc88e38468f141ef452cd 100644 ---- a/src/main/java/net/minecraft/world/item/BowItem.java -+++ b/src/main/java/net/minecraft/world/item/BowItem.java -@@ -81,7 +81,8 @@ public class BowItem extends ProjectileWeaponItem { - @Override - public InteractionResultHolder use(Level world, Player user, InteractionHand hand) { - ItemStack itemStack = user.getItemInHand(hand); -- boolean bl = !user.getProjectile(itemStack).isEmpty(); -+ boolean bl = !user.getProjectile(itemStack).isEmpty() -+ || (org.leavesmc.leaves.LeavesConfig.bowInfinityFix && net.minecraft.world.item.enchantment.EnchantmentHelper.processAmmoUse((ServerLevel) world, itemStack, new ItemStack(Items.ARROW), 1) <= 0); // Leaves - Bow infinity fix - if (!user.hasInfiniteMaterials() && !bl) { - return InteractionResultHolder.fail(itemStack); - } else { diff --git a/patches/server/0094-Zero-tick-plants.patch b/patches/server/0093-Zero-tick-plants.patch similarity index 100% rename from patches/server/0094-Zero-tick-plants.patch rename to patches/server/0093-Zero-tick-plants.patch diff --git a/patches/server/0095-Leaves-Updater.patch b/patches/server/0094-Leaves-Updater.patch similarity index 100% rename from patches/server/0095-Leaves-Updater.patch rename to patches/server/0094-Leaves-Updater.patch diff --git a/patches/server/0096-Force-peaceful-mode-switch.patch b/patches/server/0095-Force-peaceful-mode-switch.patch similarity index 100% rename from patches/server/0096-Force-peaceful-mode-switch.patch rename to patches/server/0095-Force-peaceful-mode-switch.patch diff --git a/patches/server/0097-Replay-Mod-API.patch b/patches/server/0096-Replay-Mod-API.patch similarity index 100% rename from patches/server/0097-Replay-Mod-API.patch rename to patches/server/0096-Replay-Mod-API.patch diff --git a/patches/server/0098-Leaves-I18n.patch b/patches/server/0097-Leaves-I18n.patch similarity index 100% rename from patches/server/0098-Leaves-I18n.patch rename to patches/server/0097-Leaves-I18n.patch diff --git a/patches/server/0099-Fix-minecraft-hopper-not-work-without-player.patch b/patches/server/0098-Fix-minecraft-hopper-not-work-without-player.patch similarity index 100% rename from patches/server/0099-Fix-minecraft-hopper-not-work-without-player.patch rename to patches/server/0098-Fix-minecraft-hopper-not-work-without-player.patch diff --git a/patches/server/0100-RNG-Fishing.patch b/patches/server/0099-RNG-Fishing.patch similarity index 100% rename from patches/server/0100-RNG-Fishing.patch rename to patches/server/0099-RNG-Fishing.patch diff --git a/patches/server/0101-Wool-Hopper-Counter.patch b/patches/server/0100-Wool-Hopper-Counter.patch similarity index 100% rename from patches/server/0101-Wool-Hopper-Counter.patch rename to patches/server/0100-Wool-Hopper-Counter.patch diff --git a/patches/server/0102-Leaves-Reload-Command.patch b/patches/server/0101-Leaves-Reload-Command.patch similarity index 100% rename from patches/server/0102-Leaves-Reload-Command.patch rename to patches/server/0101-Leaves-Reload-Command.patch diff --git a/patches/server/0103-Spider-jockeys-drop-gapples.patch b/patches/server/0102-Spider-jockeys-drop-gapples.patch similarity index 100% rename from patches/server/0103-Spider-jockeys-drop-gapples.patch rename to patches/server/0102-Spider-jockeys-drop-gapples.patch diff --git a/patches/server/0104-Force-Void-Trade.patch b/patches/server/0103-Force-Void-Trade.patch similarity index 100% rename from patches/server/0104-Force-Void-Trade.patch rename to patches/server/0103-Force-Void-Trade.patch diff --git a/patches/server/0105-Villager-infinite-discounts.patch b/patches/server/0104-Villager-infinite-discounts.patch similarity index 100% rename from patches/server/0105-Villager-infinite-discounts.patch rename to patches/server/0104-Villager-infinite-discounts.patch diff --git a/patches/server/0106-CCE-update-suppression.patch b/patches/server/0105-CCE-update-suppression.patch similarity index 100% rename from patches/server/0106-CCE-update-suppression.patch rename to patches/server/0105-CCE-update-suppression.patch diff --git a/patches/server/0107-Disable-offline-warn-if-use-proxy.patch b/patches/server/0106-Disable-offline-warn-if-use-proxy.patch similarity index 100% rename from patches/server/0107-Disable-offline-warn-if-use-proxy.patch rename to patches/server/0106-Disable-offline-warn-if-use-proxy.patch diff --git a/patches/server/0108-Disable-moved-wrongly-threshold.patch b/patches/server/0107-Disable-moved-wrongly-threshold.patch similarity index 97% rename from patches/server/0108-Disable-moved-wrongly-threshold.patch rename to patches/server/0107-Disable-moved-wrongly-threshold.patch index 251afb19..92a4357b 100644 --- a/patches/server/0108-Disable-moved-wrongly-threshold.patch +++ b/patches/server/0107-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/patches/server/0109-Armor-stand-cant-kill-by-mob-projectile.patch b/patches/server/0108-Armor-stand-cant-kill-by-mob-projectile.patch similarity index 100% rename from patches/server/0109-Armor-stand-cant-kill-by-mob-projectile.patch rename to patches/server/0108-Armor-stand-cant-kill-by-mob-projectile.patch diff --git a/patches/server/0110-Make-Item-tick-vanilla.patch b/patches/server/0109-Make-Item-tick-vanilla.patch similarity index 92% rename from patches/server/0110-Make-Item-tick-vanilla.patch rename to patches/server/0109-Make-Item-tick-vanilla.patch index 2b5d34c6..b760e3e1 100644 --- a/patches/server/0110-Make-Item-tick-vanilla.patch +++ b/patches/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/patches/server/0111-Copper-Bulb-1-gt-delay.patch b/patches/server/0110-Copper-Bulb-1-gt-delay.patch similarity index 100% rename from patches/server/0111-Copper-Bulb-1-gt-delay.patch rename to patches/server/0110-Copper-Bulb-1-gt-delay.patch diff --git a/patches/server/0112-Crafter-1-gt-delay.patch b/patches/server/0111-Crafter-1-gt-delay.patch similarity index 93% rename from patches/server/0112-Crafter-1-gt-delay.patch rename to patches/server/0111-Crafter-1-gt-delay.patch index 0f663be7..ac8037ba 100644 --- a/patches/server/0112-Crafter-1-gt-delay.patch +++ b/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/patches/server/0113-Linear-region-file-format.patch b/patches/server/0112-Linear-region-file-format.patch similarity index 99% rename from patches/server/0113-Linear-region-file-format.patch rename to patches/server/0112-Linear-region-file-format.patch index 6456fa71..d8fd0177 100644 --- a/patches/server/0113-Linear-region-file-format.patch +++ b/patches/server/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/patches/server/0114-No-TNT-place-update.patch b/patches/server/0113-No-TNT-place-update.patch similarity index 100% rename from patches/server/0114-No-TNT-place-update.patch rename to patches/server/0113-No-TNT-place-update.patch diff --git a/patches/server/0115-Servux-Protocol.patch b/patches/server/0114-Servux-Protocol.patch similarity index 100% rename from patches/server/0115-Servux-Protocol.patch rename to patches/server/0114-Servux-Protocol.patch diff --git a/patches/server/0116-Placing-locked-hopper-no-longer-send-NC-updates.patch b/patches/server/0115-Placing-locked-hopper-no-longer-send-NC-updates.patch similarity index 100% rename from patches/server/0116-Placing-locked-hopper-no-longer-send-NC-updates.patch rename to patches/server/0115-Placing-locked-hopper-no-longer-send-NC-updates.patch diff --git a/patches/server/0117-Renewable-deepslate.patch b/patches/server/0116-Renewable-deepslate.patch similarity index 100% rename from patches/server/0117-Renewable-deepslate.patch rename to patches/server/0116-Renewable-deepslate.patch diff --git a/patches/server/0118-Renewable-sponges.patch b/patches/server/0117-Renewable-sponges.patch similarity index 100% rename from patches/server/0118-Renewable-sponges.patch rename to patches/server/0117-Renewable-sponges.patch diff --git a/patches/server/0119-Renewable-coral.patch b/patches/server/0118-Renewable-coral.patch similarity index 100% rename from patches/server/0119-Renewable-coral.patch rename to patches/server/0118-Renewable-coral.patch diff --git a/patches/server/0120-Fast-resume.patch b/patches/server/0119-Fast-resume.patch similarity index 100% rename from patches/server/0120-Fast-resume.patch rename to patches/server/0119-Fast-resume.patch diff --git a/patches/server/0121-Vanilla-hopper.patch b/patches/server/0120-Vanilla-hopper.patch similarity index 100% rename from patches/server/0121-Vanilla-hopper.patch rename to patches/server/0120-Vanilla-hopper.patch diff --git a/patches/server/0122-Force-minecraft-command.patch b/patches/server/0121-Force-minecraft-command.patch similarity index 100% rename from patches/server/0122-Force-minecraft-command.patch rename to patches/server/0121-Force-minecraft-command.patch diff --git a/patches/server/0123-Fix-falling-block-s-block-location.patch b/patches/server/0122-Fix-falling-block-s-block-location.patch similarity index 87% rename from patches/server/0123-Fix-falling-block-s-block-location.patch rename to patches/server/0122-Fix-falling-block-s-block-location.patch index 619bf0ed..8c665fbc 100644 --- a/patches/server/0123-Fix-falling-block-s-block-location.patch +++ b/patches/server/0122-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/patches/server/0124-Fix-NPE-during-creating-GUI-graph.patch b/patches/server/0123-Fix-NPE-during-creating-GUI-graph.patch similarity index 100% rename from patches/server/0124-Fix-NPE-during-creating-GUI-graph.patch rename to patches/server/0123-Fix-NPE-during-creating-GUI-graph.patch diff --git a/patches/server/0125-Bytebuf-API.patch b/patches/server/0124-Bytebuf-API.patch similarity index 100% rename from patches/server/0125-Bytebuf-API.patch rename to patches/server/0124-Bytebuf-API.patch diff --git a/patches/server/0126-Allow-grindstone-overstacking.patch b/patches/server/0125-Allow-grindstone-overstacking.patch similarity index 100% rename from patches/server/0126-Allow-grindstone-overstacking.patch rename to patches/server/0125-Allow-grindstone-overstacking.patch diff --git a/patches/server/0127-Configurable-MC-67.patch b/patches/server/0126-Configurable-MC-67.patch similarity index 92% rename from patches/server/0127-Configurable-MC-67.patch rename to patches/server/0126-Configurable-MC-67.patch index a3e86a5d..70aef80c 100644 --- a/patches/server/0127-Configurable-MC-67.patch +++ b/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/patches/server/0128-Disable-end-gateway-portal-entity-ticking.patch b/patches/server/0127-Disable-end-gateway-portal-entity-ticking.patch similarity index 100% rename from patches/server/0128-Disable-end-gateway-portal-entity-ticking.patch rename to patches/server/0127-Disable-end-gateway-portal-entity-ticking.patch diff --git a/patches/server/0129-Disable-crystal-portal-proximity-check.patch b/patches/server/0128-Disable-crystal-portal-proximity-check.patch similarity index 100% rename from patches/server/0129-Disable-crystal-portal-proximity-check.patch rename to patches/server/0128-Disable-crystal-portal-proximity-check.patch diff --git a/patches/server/0130-Can-disable-LivingEntity-aiStep-alive-check.patch b/patches/server/0129-Can-disable-LivingEntity-aiStep-alive-check.patch similarity index 100% rename from patches/server/0130-Can-disable-LivingEntity-aiStep-alive-check.patch rename to patches/server/0129-Can-disable-LivingEntity-aiStep-alive-check.patch diff --git a/patches/server/0131-Leaves-plugins.patch b/patches/server/0130-Leaves-plugins.patch similarity index 100% rename from patches/server/0131-Leaves-plugins.patch rename to patches/server/0130-Leaves-plugins.patch