From db04bb16fc070794e068d7f1480210f11efb0967 Mon Sep 17 00:00:00 2001 From: 404Setup <153366651+404Setup@users.noreply.github.com> Date: Sat, 19 Oct 2024 19:30:53 +0800 Subject: [PATCH] Remove stream and double iteration in enough deep sleeping player check --- ...am-and-double-iteration-in-enough-de.patch | 39 +++++++++++++++++++ ...eaf-Don-t-save-falling-block-entity.patch} | 0 ...3-Leaf-Don-t-save-primed-tnt-entity.patch} | 0 ...4-Leaf-Optimize-Minecart-collisions.patch} | 0 ...ncing-of-futures-for-chunk-structur.patch} | 0 ...046-Leaf-Cache-player-profileResult.patch} | 0 ...-cache-kickPermission-instead-of-us.patch} | 0 ...tch => 0048-Leaves-Zero-tick-plants.patch} | 0 ...s.patch => 0049-Leaves-Entity-Utils.patch} | 0 ...050-Leaves-Return-nether-portal-fix.patch} | 0 ...patch => 0051-Leaves-Vanilla-hopper.patch} | 0 ...ves-Raider-die-skip-self-raid-check.patch} | 0 ...s-Fix-villagers-dont-release-memory.patch} | 0 ...-Fix-falling-block-s-block-location.patch} | 0 ...fish-Optimize-entity-coordinate-key.patch} | 0 ...ve-container-checking-with-a-bitset.patch} | 0 ...btimizations-RePathing-optimization.patch} | 0 ...timization-Zombie-Search-And-Destro.patch} | 0 ...> 0059-Divine-Implement-Secure-Seed.patch} | 0 ...9.patch => 0060-Divine-Fix-MC-31819.patch} | 0 ....patch => 0061-Divine-Fix-MC-172801.patch} | 0 ...25.patch => 0062-Divine-Fix-MC-2025.patch} | 0 ...h => 0063-Divine-C2ME-reduce_allocs.patch} | 0 ...patch => 0064-Divine-C2ME-opts-math.patch} | 0 ...69.patch => 0065-Divine-Fix-MC-7569.patch} | 0 ...> 0066-Divine-lithium-math.sine_lut.patch} | 0 ...0067-Divine-lithium-cached_hashcode.patch} | 0 ...6.patch => 0068-Divine-Fix-MC-93826.patch} | 0 ....patch => 0069-Divine-Fix-MC-110386.patch} | 0 ...0-Divine-Fix-MC-98160-and-MC-105103.patch} | 0 ...8.patch => 0071-Divine-Fix-MC-93018.patch} | 0 ...8.patch => 0072-Divine-Fix-MC-65198.patch} | 0 ....patch => 0073-Divine-Fix-MC-167242.patch} | 0 ...-Dont-load-chunks-to-spawn-phantoms.patch} | 0 ...-Optimize-Math.round-and-Math.hypot.patch} | 0 ...76-Canvas-Entity-Goal-Optimizations.patch} | 0 ...-Canvas-Optimize-Entity-Pathfinding.patch} | 0 ...8-CarpetFix-incorrectBounceLogicFix.patch} | 0 ...-explosionBreaksItemFrameInWaterFix.patch} | 0 ...rpetFix-Use-optimized-RecipeManager.patch} | 0 ...CarpetFix-Optimized-getBiome-method.patch} | 0 ...on-Random-flatten-triangular-distri.patch} | 0 ...-distanceToSqr-call-in-ServerEntity.patch} | 0 ...-dirty-stats-copy-when-requesting-p.patch} | 0 ...t-dirty-flag-when-loading-maps-from.patch} | 0 ...-Rewrite-framed-map-tracker-ticking.patch} | 0 ...87-Gale-Use-platform-math-functions.patch} | 0 ...ster-floating-point-positive-modulo.patch} | 0 ...0089-Gale-Specific-interval-TPS-API.patch} | 0 ...lock-destruction-packet-allocations.patch} | 0 ...-Gale-Optimize-matching-item-checks.patch} | 0 ...2-Gale-Store-mob-counts-in-an-array.patch} | 0 ...n-check-has-physics-before-same-veh.patch} | 0 ...ible-planar-movement-multiplication.patch} | 0 ...0095-Gale-Pre-compute-VarLong-sizes.patch} | 0 ...mize-VarInt-write-and-VarLong-write.patch} | 0 ...hunks-to-activate-climbing-entities.patch} | 0 ...duce-acquire-POI-for-stuck-entities.patch} | 0 ...e.patch => 0099-MemoryLeakFix-Biome.patch} | 0 ...lock-type-in-SculkSensorBlock-canAc.patch} | 0 ...er-Update-Alternate-Current-to-v1.9.patch} | 0 ...02-Paper-PR-Update-Velocity-natives.patch} | 2 +- ...ork-done-in-CraftMapCanvas.drawImag.patch} | 0 ...ondition-check-order-of-entity-trac.patch} | 0 ...hing-biomes-during-world-generation.patch} | 0 ...106-lithium-precompute-shape-arrays.patch} | 0 ...0107-lithium-fast-powder-snow-check.patch} | 0 ....raid.patch => 0108-lithium-ai.raid.patch} | 0 ...atch => 0109-vmp-TypeFilterableList.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...lice-Improve-map-saving-performance.patch} | 0 ...Slice-noEntityCollisions-for-Entity.patch} | 0 ...Allow-inventory-clicks-in-Spectator.patch} | 0 ...ble-sending-Entity-Movement-Packets.patch} | 0 ...karin-Save-Json-list-asynchronously.patch} | 0 ...-Remove-stream-in-PoiCompetitorScan.patch} | 0 ...-ScalableLux-Upstream-Starlight-Fix.patch} | 0 ...=> 0118-Kiterino-New-liquid-physics.patch} | 0 78 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 patches/server/0041-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch rename patches/server/{0041-Leaf-Don-t-save-falling-block-entity.patch => 0042-Leaf-Don-t-save-falling-block-entity.patch} (100%) rename patches/server/{0042-Leaf-Don-t-save-primed-tnt-entity.patch => 0043-Leaf-Don-t-save-primed-tnt-entity.patch} (100%) rename patches/server/{0043-Leaf-Optimize-Minecart-collisions.patch => 0044-Leaf-Optimize-Minecart-collisions.patch} (100%) rename patches/server/{0044-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch => 0045-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch} (100%) rename patches/server/{0045-Leaf-Cache-player-profileResult.patch => 0046-Leaf-Cache-player-profileResult.patch} (100%) rename patches/server/{0046-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch => 0047-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch} (100%) rename patches/server/{0047-Leaves-Zero-tick-plants.patch => 0048-Leaves-Zero-tick-plants.patch} (100%) rename patches/server/{0048-Leaves-Entity-Utils.patch => 0049-Leaves-Entity-Utils.patch} (100%) rename patches/server/{0049-Leaves-Return-nether-portal-fix.patch => 0050-Leaves-Return-nether-portal-fix.patch} (100%) rename patches/server/{0050-Leaves-Vanilla-hopper.patch => 0051-Leaves-Vanilla-hopper.patch} (100%) rename patches/server/{0051-Leaves-Raider-die-skip-self-raid-check.patch => 0052-Leaves-Raider-die-skip-self-raid-check.patch} (100%) rename patches/server/{0052-Leaves-Fix-villagers-dont-release-memory.patch => 0053-Leaves-Fix-villagers-dont-release-memory.patch} (100%) rename patches/server/{0053-Leaves-Fix-falling-block-s-block-location.patch => 0054-Leaves-Fix-falling-block-s-block-location.patch} (100%) rename patches/server/{0054-Pufferfish-Optimize-entity-coordinate-key.patch => 0055-Pufferfish-Optimize-entity-coordinate-key.patch} (100%) rename patches/server/{0055-Pufferfish-Improve-container-checking-with-a-bitset.patch => 0056-Pufferfish-Improve-container-checking-with-a-bitset.patch} (100%) rename patches/server/{0056-Mobtimizations-RePathing-optimization.patch => 0057-Mobtimizations-RePathing-optimization.patch} (100%) rename patches/server/{0057-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch => 0058-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch} (100%) rename patches/server/{0058-Divine-Implement-Secure-Seed.patch => 0059-Divine-Implement-Secure-Seed.patch} (100%) rename patches/server/{0059-Divine-Fix-MC-31819.patch => 0060-Divine-Fix-MC-31819.patch} (100%) rename patches/server/{0060-Divine-Fix-MC-172801.patch => 0061-Divine-Fix-MC-172801.patch} (100%) rename patches/server/{0061-Divine-Fix-MC-2025.patch => 0062-Divine-Fix-MC-2025.patch} (100%) rename patches/server/{0062-Divine-C2ME-reduce_allocs.patch => 0063-Divine-C2ME-reduce_allocs.patch} (100%) rename patches/server/{0063-Divine-C2ME-opts-math.patch => 0064-Divine-C2ME-opts-math.patch} (100%) rename patches/server/{0064-Divine-Fix-MC-7569.patch => 0065-Divine-Fix-MC-7569.patch} (100%) rename patches/server/{0065-Divine-lithium-math.sine_lut.patch => 0066-Divine-lithium-math.sine_lut.patch} (100%) rename patches/server/{0066-Divine-lithium-cached_hashcode.patch => 0067-Divine-lithium-cached_hashcode.patch} (100%) rename patches/server/{0067-Divine-Fix-MC-93826.patch => 0068-Divine-Fix-MC-93826.patch} (100%) rename patches/server/{0068-Divine-Fix-MC-110386.patch => 0069-Divine-Fix-MC-110386.patch} (100%) rename patches/server/{0069-Divine-Fix-MC-98160-and-MC-105103.patch => 0070-Divine-Fix-MC-98160-and-MC-105103.patch} (100%) rename patches/server/{0070-Divine-Fix-MC-93018.patch => 0071-Divine-Fix-MC-93018.patch} (100%) rename patches/server/{0071-Divine-Fix-MC-65198.patch => 0072-Divine-Fix-MC-65198.patch} (100%) rename patches/server/{0072-Divine-Fix-MC-167242.patch => 0073-Divine-Fix-MC-167242.patch} (100%) rename patches/server/{0073-Canvas-Dont-load-chunks-to-spawn-phantoms.patch => 0074-Canvas-Dont-load-chunks-to-spawn-phantoms.patch} (100%) rename patches/server/{0074-Canvas-Optimize-Math.round-and-Math.hypot.patch => 0075-Canvas-Optimize-Math.round-and-Math.hypot.patch} (100%) rename patches/server/{0075-Canvas-Entity-Goal-Optimizations.patch => 0076-Canvas-Entity-Goal-Optimizations.patch} (100%) rename patches/server/{0076-Canvas-Optimize-Entity-Pathfinding.patch => 0077-Canvas-Optimize-Entity-Pathfinding.patch} (100%) rename patches/server/{0077-CarpetFix-incorrectBounceLogicFix.patch => 0078-CarpetFix-incorrectBounceLogicFix.patch} (100%) rename patches/server/{0078-CarpetFix-explosionBreaksItemFrameInWaterFix.patch => 0079-CarpetFix-explosionBreaksItemFrameInWaterFix.patch} (100%) rename patches/server/{0079-CarpetFix-Use-optimized-RecipeManager.patch => 0080-CarpetFix-Use-optimized-RecipeManager.patch} (100%) rename patches/server/{0080-CarpetFix-Optimized-getBiome-method.patch => 0081-CarpetFix-Optimized-getBiome-method.patch} (100%) rename patches/server/{0081-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch => 0082-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch} (100%) rename patches/server/{0082-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0083-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename patches/server/{0083-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch => 0084-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch} (100%) rename patches/server/{0084-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch => 0085-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch} (100%) rename patches/server/{0085-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch => 0086-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch} (100%) rename patches/server/{0086-Gale-Use-platform-math-functions.patch => 0087-Gale-Use-platform-math-functions.patch} (100%) rename patches/server/{0087-Gale-Faster-floating-point-positive-modulo.patch => 0088-Gale-Faster-floating-point-positive-modulo.patch} (100%) rename patches/server/{0088-Gale-Specific-interval-TPS-API.patch => 0089-Gale-Specific-interval-TPS-API.patch} (100%) rename patches/server/{0089-Gale-Reduce-block-destruction-packet-allocations.patch => 0090-Gale-Reduce-block-destruction-packet-allocations.patch} (100%) rename patches/server/{0090-Gale-Optimize-matching-item-checks.patch => 0091-Gale-Optimize-matching-item-checks.patch} (100%) rename patches/server/{0091-Gale-Store-mob-counts-in-an-array.patch => 0092-Gale-Store-mob-counts-in-an-array.patch} (100%) rename patches/server/{0092-Gale-For-collision-check-has-physics-before-same-veh.patch => 0093-Gale-For-collision-check-has-physics-before-same-veh.patch} (100%) rename patches/server/{0093-Gale-Skip-negligible-planar-movement-multiplication.patch => 0094-Gale-Skip-negligible-planar-movement-multiplication.patch} (100%) rename patches/server/{0094-Gale-Pre-compute-VarLong-sizes.patch => 0095-Gale-Pre-compute-VarLong-sizes.patch} (100%) rename patches/server/{0095-Gale-Optimize-VarInt-write-and-VarLong-write.patch => 0096-Gale-Optimize-VarInt-write-and-VarLong-write.patch} (100%) rename patches/server/{0096-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch => 0097-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch} (100%) rename patches/server/{0097-Gale-Reduce-acquire-POI-for-stuck-entities.patch => 0098-Gale-Reduce-acquire-POI-for-stuck-entities.patch} (100%) rename patches/server/{0098-MemoryLeakFix-Biome.patch => 0099-MemoryLeakFix-Biome.patch} (100%) rename patches/server/{0099-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch => 0100-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch} (100%) rename patches/server/{0100-Paper-Update-Alternate-Current-to-v1.9.patch => 0101-Paper-Update-Alternate-Current-to-v1.9.patch} (100%) rename patches/server/{0101-Paper-PR-Update-Velocity-natives.patch => 0102-Paper-PR-Update-Velocity-natives.patch} (89%) rename patches/server/{0102-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch => 0103-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch} (100%) rename patches/server/{0103-Paper-PR-Change-condition-check-order-of-entity-trac.patch => 0104-Paper-PR-Change-condition-check-order-of-entity-trac.patch} (100%) rename patches/server/{0104-Paper-PR-Fix-fetching-biomes-during-world-generation.patch => 0105-Paper-PR-Fix-fetching-biomes-during-world-generation.patch} (100%) rename patches/server/{0105-lithium-precompute-shape-arrays.patch => 0106-lithium-precompute-shape-arrays.patch} (100%) rename patches/server/{0106-lithium-fast-powder-snow-check.patch => 0107-lithium-fast-powder-snow-check.patch} (100%) rename patches/server/{0107-lithium-ai.raid.patch => 0108-lithium-ai.raid.patch} (100%) rename patches/server/{0108-vmp-TypeFilterableList.patch => 0109-vmp-TypeFilterableList.patch} (100%) rename patches/server/{0109-vmp-skip-entity-move-if-movement-is-zero.patch => 0110-vmp-skip-entity-move-if-movement-is-zero.patch} (100%) rename patches/server/{0110-Slice-Improve-map-saving-performance.patch => 0111-Slice-Improve-map-saving-performance.patch} (100%) rename patches/server/{0111-Slice-noEntityCollisions-for-Entity.patch => 0112-Slice-noEntityCollisions-for-Entity.patch} (100%) rename patches/server/{0112-Slice-Allow-inventory-clicks-in-Spectator.patch => 0113-Slice-Allow-inventory-clicks-in-Spectator.patch} (100%) rename patches/server/{0113-Slice-Disable-sending-Entity-Movement-Packets.patch => 0114-Slice-Disable-sending-Entity-Movement-Packets.patch} (100%) rename patches/server/{0114-Akarin-Save-Json-list-asynchronously.patch => 0115-Akarin-Save-Json-list-asynchronously.patch} (100%) rename patches/server/{0115-Airplane-Remove-stream-in-PoiCompetitorScan.patch => 0116-Airplane-Remove-stream-in-PoiCompetitorScan.patch} (100%) rename patches/server/{0116-ScalableLux-Upstream-Starlight-Fix.patch => 0117-ScalableLux-Upstream-Starlight-Fix.patch} (100%) rename patches/server/{0117-Kiterino-New-liquid-physics.patch => 0118-Kiterino-New-liquid-physics.patch} (100%) diff --git a/patches/server/0041-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch b/patches/server/0041-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch new file mode 100644 index 0000000..591fda4 --- /dev/null +++ b/patches/server/0041-Leaf-Remove-stream-and-double-iteration-in-enough-de.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: 404Setup <153366651+404Setup@users.noreply.github.com> +Date: Sat, 19 Oct 2024 19:29:06 +0800 +Subject: [PATCH] Leaf: Remove stream and double iteration in enough deep + sleeping player check + + +diff --git a/src/main/java/net/minecraft/server/players/SleepStatus.java b/src/main/java/net/minecraft/server/players/SleepStatus.java +index caa8a69bde0c212c36dd990a67836ac2f95548c0..5ae435dcc078a5b9af90f01fa70f1a9d6f34e2be 100644 +--- a/src/main/java/net/minecraft/server/players/SleepStatus.java ++++ b/src/main/java/net/minecraft/server/players/SleepStatus.java +@@ -19,10 +19,24 @@ public class SleepStatus { + + public boolean areEnoughDeepSleeping(int percentage, List players) { + // CraftBukkit start +- int j = (int) players.stream().filter((eh) -> { return eh.isSleepingLongEnough() || eh.fauxSleeping || (eh.level().purpurConfig.idleTimeoutCountAsSleeping && eh.isAfk()); }).count(); // Purpur +- boolean anyDeepSleep = players.stream().anyMatch(Player::isSleepingLongEnough); ++ // Leaf start - Remove stream and double iteration in enough deep sleeping player check ++ int count = 0; ++ boolean anyPlayerSleeping = false; + +- return anyDeepSleep && j >= this.sleepersNeeded(percentage); ++ for (ServerPlayer player : players) { ++ final boolean isSleepingLongEnough = player.isSleepingLongEnough(); ++ ++ if (isSleepingLongEnough) { ++ anyPlayerSleeping = true; ++ } ++ ++ if (isSleepingLongEnough || player.fauxSleeping || (player.level().purpurConfig.idleTimeoutCountAsSleeping && player.isAfk())) { // Purpur ++ count++; ++ } ++ } ++ ++ return anyPlayerSleeping && count >= this.sleepersNeeded(percentage); ++ // Leaf end - Remove stream and double iteration in enough deep sleeping player check + // CraftBukkit end + } + diff --git a/patches/server/0041-Leaf-Don-t-save-falling-block-entity.patch b/patches/server/0042-Leaf-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0041-Leaf-Don-t-save-falling-block-entity.patch rename to patches/server/0042-Leaf-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0042-Leaf-Don-t-save-primed-tnt-entity.patch b/patches/server/0043-Leaf-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0042-Leaf-Don-t-save-primed-tnt-entity.patch rename to patches/server/0043-Leaf-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0043-Leaf-Optimize-Minecart-collisions.patch b/patches/server/0044-Leaf-Optimize-Minecart-collisions.patch similarity index 100% rename from patches/server/0043-Leaf-Optimize-Minecart-collisions.patch rename to patches/server/0044-Leaf-Optimize-Minecart-collisions.patch diff --git a/patches/server/0044-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch b/patches/server/0045-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch similarity index 100% rename from patches/server/0044-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch rename to patches/server/0045-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch diff --git a/patches/server/0045-Leaf-Cache-player-profileResult.patch b/patches/server/0046-Leaf-Cache-player-profileResult.patch similarity index 100% rename from patches/server/0045-Leaf-Cache-player-profileResult.patch rename to patches/server/0046-Leaf-Cache-player-profileResult.patch diff --git a/patches/server/0046-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch b/patches/server/0047-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch similarity index 100% rename from patches/server/0046-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch rename to patches/server/0047-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch diff --git a/patches/server/0047-Leaves-Zero-tick-plants.patch b/patches/server/0048-Leaves-Zero-tick-plants.patch similarity index 100% rename from patches/server/0047-Leaves-Zero-tick-plants.patch rename to patches/server/0048-Leaves-Zero-tick-plants.patch diff --git a/patches/server/0048-Leaves-Entity-Utils.patch b/patches/server/0049-Leaves-Entity-Utils.patch similarity index 100% rename from patches/server/0048-Leaves-Entity-Utils.patch rename to patches/server/0049-Leaves-Entity-Utils.patch diff --git a/patches/server/0049-Leaves-Return-nether-portal-fix.patch b/patches/server/0050-Leaves-Return-nether-portal-fix.patch similarity index 100% rename from patches/server/0049-Leaves-Return-nether-portal-fix.patch rename to patches/server/0050-Leaves-Return-nether-portal-fix.patch diff --git a/patches/server/0050-Leaves-Vanilla-hopper.patch b/patches/server/0051-Leaves-Vanilla-hopper.patch similarity index 100% rename from patches/server/0050-Leaves-Vanilla-hopper.patch rename to patches/server/0051-Leaves-Vanilla-hopper.patch diff --git a/patches/server/0051-Leaves-Raider-die-skip-self-raid-check.patch b/patches/server/0052-Leaves-Raider-die-skip-self-raid-check.patch similarity index 100% rename from patches/server/0051-Leaves-Raider-die-skip-self-raid-check.patch rename to patches/server/0052-Leaves-Raider-die-skip-self-raid-check.patch diff --git a/patches/server/0052-Leaves-Fix-villagers-dont-release-memory.patch b/patches/server/0053-Leaves-Fix-villagers-dont-release-memory.patch similarity index 100% rename from patches/server/0052-Leaves-Fix-villagers-dont-release-memory.patch rename to patches/server/0053-Leaves-Fix-villagers-dont-release-memory.patch diff --git a/patches/server/0053-Leaves-Fix-falling-block-s-block-location.patch b/patches/server/0054-Leaves-Fix-falling-block-s-block-location.patch similarity index 100% rename from patches/server/0053-Leaves-Fix-falling-block-s-block-location.patch rename to patches/server/0054-Leaves-Fix-falling-block-s-block-location.patch diff --git a/patches/server/0054-Pufferfish-Optimize-entity-coordinate-key.patch b/patches/server/0055-Pufferfish-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0054-Pufferfish-Optimize-entity-coordinate-key.patch rename to patches/server/0055-Pufferfish-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0055-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0056-Pufferfish-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0055-Pufferfish-Improve-container-checking-with-a-bitset.patch rename to patches/server/0056-Pufferfish-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0056-Mobtimizations-RePathing-optimization.patch b/patches/server/0057-Mobtimizations-RePathing-optimization.patch similarity index 100% rename from patches/server/0056-Mobtimizations-RePathing-optimization.patch rename to patches/server/0057-Mobtimizations-RePathing-optimization.patch diff --git a/patches/server/0057-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch b/patches/server/0058-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch similarity index 100% rename from patches/server/0057-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch rename to patches/server/0058-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch diff --git a/patches/server/0058-Divine-Implement-Secure-Seed.patch b/patches/server/0059-Divine-Implement-Secure-Seed.patch similarity index 100% rename from patches/server/0058-Divine-Implement-Secure-Seed.patch rename to patches/server/0059-Divine-Implement-Secure-Seed.patch diff --git a/patches/server/0059-Divine-Fix-MC-31819.patch b/patches/server/0060-Divine-Fix-MC-31819.patch similarity index 100% rename from patches/server/0059-Divine-Fix-MC-31819.patch rename to patches/server/0060-Divine-Fix-MC-31819.patch diff --git a/patches/server/0060-Divine-Fix-MC-172801.patch b/patches/server/0061-Divine-Fix-MC-172801.patch similarity index 100% rename from patches/server/0060-Divine-Fix-MC-172801.patch rename to patches/server/0061-Divine-Fix-MC-172801.patch diff --git a/patches/server/0061-Divine-Fix-MC-2025.patch b/patches/server/0062-Divine-Fix-MC-2025.patch similarity index 100% rename from patches/server/0061-Divine-Fix-MC-2025.patch rename to patches/server/0062-Divine-Fix-MC-2025.patch diff --git a/patches/server/0062-Divine-C2ME-reduce_allocs.patch b/patches/server/0063-Divine-C2ME-reduce_allocs.patch similarity index 100% rename from patches/server/0062-Divine-C2ME-reduce_allocs.patch rename to patches/server/0063-Divine-C2ME-reduce_allocs.patch diff --git a/patches/server/0063-Divine-C2ME-opts-math.patch b/patches/server/0064-Divine-C2ME-opts-math.patch similarity index 100% rename from patches/server/0063-Divine-C2ME-opts-math.patch rename to patches/server/0064-Divine-C2ME-opts-math.patch diff --git a/patches/server/0064-Divine-Fix-MC-7569.patch b/patches/server/0065-Divine-Fix-MC-7569.patch similarity index 100% rename from patches/server/0064-Divine-Fix-MC-7569.patch rename to patches/server/0065-Divine-Fix-MC-7569.patch diff --git a/patches/server/0065-Divine-lithium-math.sine_lut.patch b/patches/server/0066-Divine-lithium-math.sine_lut.patch similarity index 100% rename from patches/server/0065-Divine-lithium-math.sine_lut.patch rename to patches/server/0066-Divine-lithium-math.sine_lut.patch diff --git a/patches/server/0066-Divine-lithium-cached_hashcode.patch b/patches/server/0067-Divine-lithium-cached_hashcode.patch similarity index 100% rename from patches/server/0066-Divine-lithium-cached_hashcode.patch rename to patches/server/0067-Divine-lithium-cached_hashcode.patch diff --git a/patches/server/0067-Divine-Fix-MC-93826.patch b/patches/server/0068-Divine-Fix-MC-93826.patch similarity index 100% rename from patches/server/0067-Divine-Fix-MC-93826.patch rename to patches/server/0068-Divine-Fix-MC-93826.patch diff --git a/patches/server/0068-Divine-Fix-MC-110386.patch b/patches/server/0069-Divine-Fix-MC-110386.patch similarity index 100% rename from patches/server/0068-Divine-Fix-MC-110386.patch rename to patches/server/0069-Divine-Fix-MC-110386.patch diff --git a/patches/server/0069-Divine-Fix-MC-98160-and-MC-105103.patch b/patches/server/0070-Divine-Fix-MC-98160-and-MC-105103.patch similarity index 100% rename from patches/server/0069-Divine-Fix-MC-98160-and-MC-105103.patch rename to patches/server/0070-Divine-Fix-MC-98160-and-MC-105103.patch diff --git a/patches/server/0070-Divine-Fix-MC-93018.patch b/patches/server/0071-Divine-Fix-MC-93018.patch similarity index 100% rename from patches/server/0070-Divine-Fix-MC-93018.patch rename to patches/server/0071-Divine-Fix-MC-93018.patch diff --git a/patches/server/0071-Divine-Fix-MC-65198.patch b/patches/server/0072-Divine-Fix-MC-65198.patch similarity index 100% rename from patches/server/0071-Divine-Fix-MC-65198.patch rename to patches/server/0072-Divine-Fix-MC-65198.patch diff --git a/patches/server/0072-Divine-Fix-MC-167242.patch b/patches/server/0073-Divine-Fix-MC-167242.patch similarity index 100% rename from patches/server/0072-Divine-Fix-MC-167242.patch rename to patches/server/0073-Divine-Fix-MC-167242.patch diff --git a/patches/server/0073-Canvas-Dont-load-chunks-to-spawn-phantoms.patch b/patches/server/0074-Canvas-Dont-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0073-Canvas-Dont-load-chunks-to-spawn-phantoms.patch rename to patches/server/0074-Canvas-Dont-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0074-Canvas-Optimize-Math.round-and-Math.hypot.patch b/patches/server/0075-Canvas-Optimize-Math.round-and-Math.hypot.patch similarity index 100% rename from patches/server/0074-Canvas-Optimize-Math.round-and-Math.hypot.patch rename to patches/server/0075-Canvas-Optimize-Math.round-and-Math.hypot.patch diff --git a/patches/server/0075-Canvas-Entity-Goal-Optimizations.patch b/patches/server/0076-Canvas-Entity-Goal-Optimizations.patch similarity index 100% rename from patches/server/0075-Canvas-Entity-Goal-Optimizations.patch rename to patches/server/0076-Canvas-Entity-Goal-Optimizations.patch diff --git a/patches/server/0076-Canvas-Optimize-Entity-Pathfinding.patch b/patches/server/0077-Canvas-Optimize-Entity-Pathfinding.patch similarity index 100% rename from patches/server/0076-Canvas-Optimize-Entity-Pathfinding.patch rename to patches/server/0077-Canvas-Optimize-Entity-Pathfinding.patch diff --git a/patches/server/0077-CarpetFix-incorrectBounceLogicFix.patch b/patches/server/0078-CarpetFix-incorrectBounceLogicFix.patch similarity index 100% rename from patches/server/0077-CarpetFix-incorrectBounceLogicFix.patch rename to patches/server/0078-CarpetFix-incorrectBounceLogicFix.patch diff --git a/patches/server/0078-CarpetFix-explosionBreaksItemFrameInWaterFix.patch b/patches/server/0079-CarpetFix-explosionBreaksItemFrameInWaterFix.patch similarity index 100% rename from patches/server/0078-CarpetFix-explosionBreaksItemFrameInWaterFix.patch rename to patches/server/0079-CarpetFix-explosionBreaksItemFrameInWaterFix.patch diff --git a/patches/server/0079-CarpetFix-Use-optimized-RecipeManager.patch b/patches/server/0080-CarpetFix-Use-optimized-RecipeManager.patch similarity index 100% rename from patches/server/0079-CarpetFix-Use-optimized-RecipeManager.patch rename to patches/server/0080-CarpetFix-Use-optimized-RecipeManager.patch diff --git a/patches/server/0080-CarpetFix-Optimized-getBiome-method.patch b/patches/server/0081-CarpetFix-Optimized-getBiome-method.patch similarity index 100% rename from patches/server/0080-CarpetFix-Optimized-getBiome-method.patch rename to patches/server/0081-CarpetFix-Optimized-getBiome-method.patch diff --git a/patches/server/0081-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch b/patches/server/0082-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch similarity index 100% rename from patches/server/0081-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch rename to patches/server/0082-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch diff --git a/patches/server/0082-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0083-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0082-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0083-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0083-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch b/patches/server/0084-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch similarity index 100% rename from patches/server/0083-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch rename to patches/server/0084-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch diff --git a/patches/server/0084-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch b/patches/server/0085-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch similarity index 100% rename from patches/server/0084-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch rename to patches/server/0085-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch diff --git a/patches/server/0085-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch b/patches/server/0086-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch similarity index 100% rename from patches/server/0085-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch rename to patches/server/0086-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch diff --git a/patches/server/0086-Gale-Use-platform-math-functions.patch b/patches/server/0087-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0086-Gale-Use-platform-math-functions.patch rename to patches/server/0087-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0087-Gale-Faster-floating-point-positive-modulo.patch b/patches/server/0088-Gale-Faster-floating-point-positive-modulo.patch similarity index 100% rename from patches/server/0087-Gale-Faster-floating-point-positive-modulo.patch rename to patches/server/0088-Gale-Faster-floating-point-positive-modulo.patch diff --git a/patches/server/0088-Gale-Specific-interval-TPS-API.patch b/patches/server/0089-Gale-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0088-Gale-Specific-interval-TPS-API.patch rename to patches/server/0089-Gale-Specific-interval-TPS-API.patch diff --git a/patches/server/0089-Gale-Reduce-block-destruction-packet-allocations.patch b/patches/server/0090-Gale-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0089-Gale-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0090-Gale-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0090-Gale-Optimize-matching-item-checks.patch b/patches/server/0091-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0090-Gale-Optimize-matching-item-checks.patch rename to patches/server/0091-Gale-Optimize-matching-item-checks.patch diff --git a/patches/server/0091-Gale-Store-mob-counts-in-an-array.patch b/patches/server/0092-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0091-Gale-Store-mob-counts-in-an-array.patch rename to patches/server/0092-Gale-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0092-Gale-For-collision-check-has-physics-before-same-veh.patch b/patches/server/0093-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 100% rename from patches/server/0092-Gale-For-collision-check-has-physics-before-same-veh.patch rename to patches/server/0093-Gale-For-collision-check-has-physics-before-same-veh.patch diff --git a/patches/server/0093-Gale-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0094-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0093-Gale-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0094-Gale-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0094-Gale-Pre-compute-VarLong-sizes.patch b/patches/server/0095-Gale-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0094-Gale-Pre-compute-VarLong-sizes.patch rename to patches/server/0095-Gale-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0095-Gale-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0096-Gale-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from patches/server/0095-Gale-Optimize-VarInt-write-and-VarLong-write.patch rename to patches/server/0096-Gale-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/patches/server/0096-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0097-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0096-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0097-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0097-Gale-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0098-Gale-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0097-Gale-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0098-Gale-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0098-MemoryLeakFix-Biome.patch b/patches/server/0099-MemoryLeakFix-Biome.patch similarity index 100% rename from patches/server/0098-MemoryLeakFix-Biome.patch rename to patches/server/0099-MemoryLeakFix-Biome.patch diff --git a/patches/server/0099-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch b/patches/server/0100-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch similarity index 100% rename from patches/server/0099-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch rename to patches/server/0100-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch diff --git a/patches/server/0100-Paper-Update-Alternate-Current-to-v1.9.patch b/patches/server/0101-Paper-Update-Alternate-Current-to-v1.9.patch similarity index 100% rename from patches/server/0100-Paper-Update-Alternate-Current-to-v1.9.patch rename to patches/server/0101-Paper-Update-Alternate-Current-to-v1.9.patch diff --git a/patches/server/0101-Paper-PR-Update-Velocity-natives.patch b/patches/server/0102-Paper-PR-Update-Velocity-natives.patch similarity index 89% rename from patches/server/0101-Paper-PR-Update-Velocity-natives.patch rename to patches/server/0102-Paper-PR-Update-Velocity-natives.patch index 22816bc..1e85f1d 100644 --- a/patches/server/0101-Paper-PR-Update-Velocity-natives.patch +++ b/patches/server/0102-Paper-PR-Update-Velocity-natives.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Paper PR Update Velocity natives Source in https://github.com/PaperMC/Paper/pull/11347 diff --git a/build.gradle.kts b/build.gradle.kts -index be36af8d51818204c6f4dd4d9ec4665eb9ba7f5c..1553eb2b53eaa7155330fac13603a11eb1b33859 100644 +index dfc011af50c8bca01bf0effbb8a72926628b26a4..9baaa79648a0a829726ee89a5712342fb7a4dfad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ dependencies { diff --git a/patches/server/0102-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0103-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch similarity index 100% rename from patches/server/0102-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch rename to patches/server/0103-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch diff --git a/patches/server/0103-Paper-PR-Change-condition-check-order-of-entity-trac.patch b/patches/server/0104-Paper-PR-Change-condition-check-order-of-entity-trac.patch similarity index 100% rename from patches/server/0103-Paper-PR-Change-condition-check-order-of-entity-trac.patch rename to patches/server/0104-Paper-PR-Change-condition-check-order-of-entity-trac.patch diff --git a/patches/server/0104-Paper-PR-Fix-fetching-biomes-during-world-generation.patch b/patches/server/0105-Paper-PR-Fix-fetching-biomes-during-world-generation.patch similarity index 100% rename from patches/server/0104-Paper-PR-Fix-fetching-biomes-during-world-generation.patch rename to patches/server/0105-Paper-PR-Fix-fetching-biomes-during-world-generation.patch diff --git a/patches/server/0105-lithium-precompute-shape-arrays.patch b/patches/server/0106-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0105-lithium-precompute-shape-arrays.patch rename to patches/server/0106-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0106-lithium-fast-powder-snow-check.patch b/patches/server/0107-lithium-fast-powder-snow-check.patch similarity index 100% rename from patches/server/0106-lithium-fast-powder-snow-check.patch rename to patches/server/0107-lithium-fast-powder-snow-check.patch diff --git a/patches/server/0107-lithium-ai.raid.patch b/patches/server/0108-lithium-ai.raid.patch similarity index 100% rename from patches/server/0107-lithium-ai.raid.patch rename to patches/server/0108-lithium-ai.raid.patch diff --git a/patches/server/0108-vmp-TypeFilterableList.patch b/patches/server/0109-vmp-TypeFilterableList.patch similarity index 100% rename from patches/server/0108-vmp-TypeFilterableList.patch rename to patches/server/0109-vmp-TypeFilterableList.patch diff --git a/patches/server/0109-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0110-vmp-skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0109-vmp-skip-entity-move-if-movement-is-zero.patch rename to patches/server/0110-vmp-skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0110-Slice-Improve-map-saving-performance.patch b/patches/server/0111-Slice-Improve-map-saving-performance.patch similarity index 100% rename from patches/server/0110-Slice-Improve-map-saving-performance.patch rename to patches/server/0111-Slice-Improve-map-saving-performance.patch diff --git a/patches/server/0111-Slice-noEntityCollisions-for-Entity.patch b/patches/server/0112-Slice-noEntityCollisions-for-Entity.patch similarity index 100% rename from patches/server/0111-Slice-noEntityCollisions-for-Entity.patch rename to patches/server/0112-Slice-noEntityCollisions-for-Entity.patch diff --git a/patches/server/0112-Slice-Allow-inventory-clicks-in-Spectator.patch b/patches/server/0113-Slice-Allow-inventory-clicks-in-Spectator.patch similarity index 100% rename from patches/server/0112-Slice-Allow-inventory-clicks-in-Spectator.patch rename to patches/server/0113-Slice-Allow-inventory-clicks-in-Spectator.patch diff --git a/patches/server/0113-Slice-Disable-sending-Entity-Movement-Packets.patch b/patches/server/0114-Slice-Disable-sending-Entity-Movement-Packets.patch similarity index 100% rename from patches/server/0113-Slice-Disable-sending-Entity-Movement-Packets.patch rename to patches/server/0114-Slice-Disable-sending-Entity-Movement-Packets.patch diff --git a/patches/server/0114-Akarin-Save-Json-list-asynchronously.patch b/patches/server/0115-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from patches/server/0114-Akarin-Save-Json-list-asynchronously.patch rename to patches/server/0115-Akarin-Save-Json-list-asynchronously.patch diff --git a/patches/server/0115-Airplane-Remove-stream-in-PoiCompetitorScan.patch b/patches/server/0116-Airplane-Remove-stream-in-PoiCompetitorScan.patch similarity index 100% rename from patches/server/0115-Airplane-Remove-stream-in-PoiCompetitorScan.patch rename to patches/server/0116-Airplane-Remove-stream-in-PoiCompetitorScan.patch diff --git a/patches/server/0116-ScalableLux-Upstream-Starlight-Fix.patch b/patches/server/0117-ScalableLux-Upstream-Starlight-Fix.patch similarity index 100% rename from patches/server/0116-ScalableLux-Upstream-Starlight-Fix.patch rename to patches/server/0117-ScalableLux-Upstream-Starlight-Fix.patch diff --git a/patches/server/0117-Kiterino-New-liquid-physics.patch b/patches/server/0118-Kiterino-New-liquid-physics.patch similarity index 100% rename from patches/server/0117-Kiterino-New-liquid-physics.patch rename to patches/server/0118-Kiterino-New-liquid-physics.patch