From 6cfa6da5388508af2407a0cb4e770d39ab863700 Mon Sep 17 00:00:00 2001 From: 404Setup <153366651+404Setup@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:39:08 +0800 Subject: [PATCH] Don't save FireworkRocket Entity --- patches/api/0005-Vine-Config.patch | 57 +++++-------------- patches/server/0009-Vine-Config-Feature.patch | 6 +- ...027-Don-t-save-FireworkRocket-Entity.patch | 22 +++++++ ...tch => 0028-Disable-respawn-ceiling.patch} | 0 ...Store-gamerules-in-fastutil-hashmap.patch} | 0 ...e-spark.patch => 0030-disable-spark.patch} | 0 ... 0031-SIMD-support-range-adjustment.patch} | 0 ...nts.patch => 0032-Skip-empty-events.patch} | 0 ...17.patch => 0033-Leaf-Fix-MC-119417.patch} | 0 ...34.patch => 0034-Leaf-Fix-MC-266334.patch} | 0 ...18.patch => 0035-Leaf-Fix-MC-200418.patch} | 0 ...18.patch => 0036-Leaf-Fix-MC-183518.patch} | 0 ...atch => 0037-Leaf-Fix-sprint-glitch.patch} | 0 ...m-in-BlockBehaviour-cache-blockstat.patch} | 0 ...eaf-Don-t-save-falling-block-entity.patch} | 0 ...0-Leaf-Don-t-save-primed-tnt-entity.patch} | 0 ...1-Leaf-Optimize-Minecart-collisions.patch} | 0 ...ncing-of-futures-for-chunk-structur.patch} | 0 ...043-Leaf-Cache-player-profileResult.patch} | 0 ...-cache-kickPermission-instead-of-us.patch} | 0 ...tch => 0045-Leaves-Zero-tick-plants.patch} | 0 ...s.patch => 0046-Leaves-Entity-Utils.patch} | 0 ...047-Leaves-Return-nether-portal-fix.patch} | 0 ...patch => 0048-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 ...> 0056-Divine-Implement-Secure-Seed.patch} | 0 ...9.patch => 0057-Divine-Fix-MC-31819.patch} | 0 ....patch => 0058-Divine-Fix-MC-172801.patch} | 0 ...25.patch => 0059-Divine-Fix-MC-2025.patch} | 0 ...h => 0060-Divine-C2ME-reduce_allocs.patch} | 0 ...patch => 0061-Divine-C2ME-opts-math.patch} | 0 ...69.patch => 0062-Divine-Fix-MC-7569.patch} | 0 ...> 0063-Divine-lithium-math.sine_lut.patch} | 0 ...0064-Divine-lithium-cached_hashcode.patch} | 0 ...6.patch => 0065-Divine-Fix-MC-93826.patch} | 0 ....patch => 0066-Divine-Fix-MC-110386.patch} | 0 ...7-Divine-Fix-MC-98160-and-MC-105103.patch} | 0 ...8.patch => 0068-Divine-Fix-MC-93018.patch} | 0 ...8.patch => 0069-Divine-Fix-MC-65198.patch} | 0 ....patch => 0070-Divine-Fix-MC-167242.patch} | 0 ...-Dont-load-chunks-to-spawn-phantoms.patch} | 0 ...-Optimize-Math.round-and-Math.hypot.patch} | 0 ...73-Canvas-Entity-Goal-Optimizations.patch} | 0 ...-Canvas-Optimize-Entity-Pathfinding.patch} | 0 ...5-CarpetFix-incorrectBounceLogicFix.patch} | 0 ...-explosionBreaksItemFrameInWaterFix.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 ...82-Gale-Use-platform-math-functions.patch} | 0 ...ster-floating-point-positive-modulo.patch} | 0 ...0084-Gale-Specific-interval-TPS-API.patch} | 0 ...lock-destruction-packet-allocations.patch} | 0 ...-Gale-Optimize-matching-item-checks.patch} | 0 ...7-Gale-Store-mob-counts-in-an-array.patch} | 0 ...n-check-has-physics-before-same-veh.patch} | 0 ...ible-planar-movement-multiplication.patch} | 0 ...0090-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 => 0094-MemoryLeakFix-Biome.patch} | 0 ...lock-type-in-SculkSensorBlock-canAc.patch} | 0 ...er-Update-Alternate-Current-to-v1.9.patch} | 0 ...97-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 ...101-lithium-precompute-shape-arrays.patch} | 0 ...0102-lithium-fast-powder-snow-check.patch} | 0 ...atch => 0103-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 ...=> 0112-Kiterino-New-liquid-physics.patch} | 0 88 files changed, 41 insertions(+), 46 deletions(-) create mode 100644 patches/server/0027-Don-t-save-FireworkRocket-Entity.patch rename patches/server/{0027-Disable-respawn-ceiling.patch => 0028-Disable-respawn-ceiling.patch} (100%) rename patches/server/{0028-Store-gamerules-in-fastutil-hashmap.patch => 0029-Store-gamerules-in-fastutil-hashmap.patch} (100%) rename patches/server/{0029-disable-spark.patch => 0030-disable-spark.patch} (100%) rename patches/server/{0030-SIMD-support-range-adjustment.patch => 0031-SIMD-support-range-adjustment.patch} (100%) rename patches/server/{0031-Skip-empty-events.patch => 0032-Skip-empty-events.patch} (100%) rename patches/server/{0032-Leaf-Fix-MC-119417.patch => 0033-Leaf-Fix-MC-119417.patch} (100%) rename patches/server/{0033-Leaf-Fix-MC-266334.patch => 0034-Leaf-Fix-MC-266334.patch} (100%) rename patches/server/{0034-Leaf-Fix-MC-200418.patch => 0035-Leaf-Fix-MC-200418.patch} (100%) rename patches/server/{0035-Leaf-Fix-MC-183518.patch => 0036-Leaf-Fix-MC-183518.patch} (100%) rename patches/server/{0036-Leaf-Fix-sprint-glitch.patch => 0037-Leaf-Fix-sprint-glitch.patch} (100%) rename patches/server/{0037-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch => 0038-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch} (100%) rename patches/server/{0038-Leaf-Don-t-save-falling-block-entity.patch => 0039-Leaf-Don-t-save-falling-block-entity.patch} (100%) rename patches/server/{0039-Leaf-Don-t-save-primed-tnt-entity.patch => 0040-Leaf-Don-t-save-primed-tnt-entity.patch} (100%) rename patches/server/{0040-Leaf-Optimize-Minecart-collisions.patch => 0041-Leaf-Optimize-Minecart-collisions.patch} (100%) rename patches/server/{0041-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch => 0042-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch} (100%) rename patches/server/{0042-Leaf-Cache-player-profileResult.patch => 0043-Leaf-Cache-player-profileResult.patch} (100%) rename patches/server/{0043-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch => 0044-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch} (100%) rename patches/server/{0044-Leaves-Zero-tick-plants.patch => 0045-Leaves-Zero-tick-plants.patch} (100%) rename patches/server/{0045-Leaves-Entity-Utils.patch => 0046-Leaves-Entity-Utils.patch} (100%) rename patches/server/{0046-Leaves-Return-nether-portal-fix.patch => 0047-Leaves-Return-nether-portal-fix.patch} (100%) rename patches/server/{0047-Leaves-Vanilla-hopper.patch => 0048-Leaves-Vanilla-hopper.patch} (100%) rename patches/server/{0048-Leaves-Raider-die-skip-self-raid-check.patch => 0049-Leaves-Raider-die-skip-self-raid-check.patch} (100%) rename patches/server/{0049-Leaves-Fix-villagers-dont-release-memory.patch => 0050-Leaves-Fix-villagers-dont-release-memory.patch} (100%) rename patches/server/{0050-Leaves-Fix-falling-block-s-block-location.patch => 0051-Leaves-Fix-falling-block-s-block-location.patch} (100%) rename patches/server/{0051-Pufferfish-Optimize-entity-coordinate-key.patch => 0052-Pufferfish-Optimize-entity-coordinate-key.patch} (100%) rename patches/server/{0052-Pufferfish-Improve-container-checking-with-a-bitset.patch => 0053-Pufferfish-Improve-container-checking-with-a-bitset.patch} (100%) rename patches/server/{0053-Mobtimizations-RePathing-optimization.patch => 0054-Mobtimizations-RePathing-optimization.patch} (100%) rename patches/server/{0054-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch => 0055-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch} (100%) rename patches/server/{0055-Divine-Implement-Secure-Seed.patch => 0056-Divine-Implement-Secure-Seed.patch} (100%) rename patches/server/{0056-Divine-Fix-MC-31819.patch => 0057-Divine-Fix-MC-31819.patch} (100%) rename patches/server/{0057-Divine-Fix-MC-172801.patch => 0058-Divine-Fix-MC-172801.patch} (100%) rename patches/server/{0058-Divine-Fix-MC-2025.patch => 0059-Divine-Fix-MC-2025.patch} (100%) rename patches/server/{0059-Divine-C2ME-reduce_allocs.patch => 0060-Divine-C2ME-reduce_allocs.patch} (100%) rename patches/server/{0060-Divine-C2ME-opts-math.patch => 0061-Divine-C2ME-opts-math.patch} (100%) rename patches/server/{0061-Divine-Fix-MC-7569.patch => 0062-Divine-Fix-MC-7569.patch} (100%) rename patches/server/{0062-Divine-lithium-math.sine_lut.patch => 0063-Divine-lithium-math.sine_lut.patch} (100%) rename patches/server/{0063-Divine-lithium-cached_hashcode.patch => 0064-Divine-lithium-cached_hashcode.patch} (100%) rename patches/server/{0064-Divine-Fix-MC-93826.patch => 0065-Divine-Fix-MC-93826.patch} (100%) rename patches/server/{0065-Divine-Fix-MC-110386.patch => 0066-Divine-Fix-MC-110386.patch} (100%) rename patches/server/{0066-Divine-Fix-MC-98160-and-MC-105103.patch => 0067-Divine-Fix-MC-98160-and-MC-105103.patch} (100%) rename patches/server/{0067-Divine-Fix-MC-93018.patch => 0068-Divine-Fix-MC-93018.patch} (100%) rename patches/server/{0068-Divine-Fix-MC-65198.patch => 0069-Divine-Fix-MC-65198.patch} (100%) rename patches/server/{0069-Divine-Fix-MC-167242.patch => 0070-Divine-Fix-MC-167242.patch} (100%) rename patches/server/{0070-Canvas-Dont-load-chunks-to-spawn-phantoms.patch => 0071-Canvas-Dont-load-chunks-to-spawn-phantoms.patch} (100%) rename patches/server/{0071-Canvas-Optimize-Math.round-and-Math.hypot.patch => 0072-Canvas-Optimize-Math.round-and-Math.hypot.patch} (100%) rename patches/server/{0072-Canvas-Entity-Goal-Optimizations.patch => 0073-Canvas-Entity-Goal-Optimizations.patch} (100%) rename patches/server/{0073-Canvas-Optimize-Entity-Pathfinding.patch => 0074-Canvas-Optimize-Entity-Pathfinding.patch} (100%) rename patches/server/{0074-CarpetFix-incorrectBounceLogicFix.patch => 0075-CarpetFix-incorrectBounceLogicFix.patch} (100%) rename patches/server/{0075-CarpetFix-explosionBreaksItemFrameInWaterFix.patch => 0076-CarpetFix-explosionBreaksItemFrameInWaterFix.patch} (100%) rename patches/server/{0076-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch => 0077-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch} (100%) rename patches/server/{0077-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch => 0078-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch} (100%) rename patches/server/{0078-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch => 0079-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch} (100%) rename patches/server/{0079-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch => 0080-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch} (100%) rename patches/server/{0080-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch => 0081-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch} (100%) rename patches/server/{0081-Gale-Use-platform-math-functions.patch => 0082-Gale-Use-platform-math-functions.patch} (100%) rename patches/server/{0082-Gale-Faster-floating-point-positive-modulo.patch => 0083-Gale-Faster-floating-point-positive-modulo.patch} (100%) rename patches/server/{0083-Gale-Specific-interval-TPS-API.patch => 0084-Gale-Specific-interval-TPS-API.patch} (100%) rename patches/server/{0084-Gale-Reduce-block-destruction-packet-allocations.patch => 0085-Gale-Reduce-block-destruction-packet-allocations.patch} (100%) rename patches/server/{0085-Gale-Optimize-matching-item-checks.patch => 0086-Gale-Optimize-matching-item-checks.patch} (100%) rename patches/server/{0086-Gale-Store-mob-counts-in-an-array.patch => 0087-Gale-Store-mob-counts-in-an-array.patch} (100%) rename patches/server/{0087-Gale-For-collision-check-has-physics-before-same-veh.patch => 0088-Gale-For-collision-check-has-physics-before-same-veh.patch} (100%) rename patches/server/{0088-Gale-Skip-negligible-planar-movement-multiplication.patch => 0089-Gale-Skip-negligible-planar-movement-multiplication.patch} (100%) rename patches/server/{0089-Gale-Pre-compute-VarLong-sizes.patch => 0090-Gale-Pre-compute-VarLong-sizes.patch} (100%) rename patches/server/{0090-Gale-Optimize-VarInt-write-and-VarLong-write.patch => 0091-Gale-Optimize-VarInt-write-and-VarLong-write.patch} (100%) rename patches/server/{0091-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch => 0092-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch} (100%) rename patches/server/{0092-Gale-Reduce-acquire-POI-for-stuck-entities.patch => 0093-Gale-Reduce-acquire-POI-for-stuck-entities.patch} (100%) rename patches/server/{0093-MemoryLeakFix-Biome.patch => 0094-MemoryLeakFix-Biome.patch} (100%) rename patches/server/{0094-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch => 0095-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch} (100%) rename patches/server/{0095-Paper-Update-Alternate-Current-to-v1.9.patch => 0096-Paper-Update-Alternate-Current-to-v1.9.patch} (100%) rename patches/server/{0096-Paper-PR-Update-Velocity-natives.patch => 0097-Paper-PR-Update-Velocity-natives.patch} (89%) rename patches/server/{0097-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch => 0098-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch} (100%) rename patches/server/{0098-Paper-PR-Change-condition-check-order-of-entity-trac.patch => 0099-Paper-PR-Change-condition-check-order-of-entity-trac.patch} (100%) rename patches/server/{0099-Paper-PR-Fix-fetching-biomes-during-world-generation.patch => 0100-Paper-PR-Fix-fetching-biomes-during-world-generation.patch} (100%) rename patches/server/{0100-lithium-precompute-shape-arrays.patch => 0101-lithium-precompute-shape-arrays.patch} (100%) rename patches/server/{0101-lithium-fast-powder-snow-check.patch => 0102-lithium-fast-powder-snow-check.patch} (100%) rename patches/server/{0102-vmp-TypeFilterableList.patch => 0103-vmp-TypeFilterableList.patch} (100%) rename patches/server/{0103-vmp-skip-entity-move-if-movement-is-zero.patch => 0104-vmp-skip-entity-move-if-movement-is-zero.patch} (100%) rename patches/server/{0104-Slice-Improve-map-saving-performance.patch => 0105-Slice-Improve-map-saving-performance.patch} (100%) rename patches/server/{0105-Slice-noEntityCollisions-for-Entity.patch => 0106-Slice-noEntityCollisions-for-Entity.patch} (100%) rename patches/server/{0106-Slice-Allow-inventory-clicks-in-Spectator.patch => 0107-Slice-Allow-inventory-clicks-in-Spectator.patch} (100%) rename patches/server/{0107-Slice-Disable-sending-Entity-Movement-Packets.patch => 0108-Slice-Disable-sending-Entity-Movement-Packets.patch} (100%) rename patches/server/{0108-Akarin-Save-Json-list-asynchronously.patch => 0109-Akarin-Save-Json-list-asynchronously.patch} (100%) rename patches/server/{0109-Airplane-Remove-stream-in-PoiCompetitorScan.patch => 0110-Airplane-Remove-stream-in-PoiCompetitorScan.patch} (100%) rename patches/server/{0110-ScalableLux-Upstream-Starlight-Fix.patch => 0111-ScalableLux-Upstream-Starlight-Fix.patch} (100%) rename patches/server/{0111-Kiterino-New-liquid-physics.patch => 0112-Kiterino-New-liquid-physics.patch} (100%) diff --git a/patches/api/0005-Vine-Config.patch b/patches/api/0005-Vine-Config.patch index 6b3d2e6..455ee20 100644 --- a/patches/api/0005-Vine-Config.patch +++ b/patches/api/0005-Vine-Config.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Vine Config diff --git a/src/main/java/one/tranic/vine/config/VineConfig.java b/src/main/java/one/tranic/vine/config/VineConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..4dfa90e779bc6c6415dd6c587445bf33d48cd67b +index 0000000000000000000000000000000000000000..fb5b6306efe79a7f7d5ba2fc8e4200997fd09621 --- /dev/null +++ b/src/main/java/one/tranic/vine/config/VineConfig.java -@@ -0,0 +1,178 @@ +@@ -0,0 +1,149 @@ +package one.tranic.vine.config; + +import one.tranic.vine.region.Compression; @@ -42,18 +42,11 @@ index 0000000000000000000000000000000000000000..4dfa90e779bc6c6415dd6c587445bf33 + } + + public static class Feature { -+ /** -+ * This just removes spark from being loaded by default, if you disable it, or install spark yourself, it will still be loaded. -+ */ ++ // This just removes spark from being loaded by default, if you disable it, or install spark yourself, it will still be loaded. + public static boolean disableSpark = true; -+ /** -+ * If the player is blocked on the top of the player's head, he will not try to rebirth the player on the ceiling. -+ */ ++ // If the player is blocked on the top of the player's head, he will not try to rebirth the player on the ceiling. + public static boolean disableRespawnCeiling = false; + public static boolean flattenTriangularDistribution = false; -+ /** -+ * The new liquid physics system may affect some mechanisms. -+ */ + public static boolean liquidPhysics = false; + /** + * Switch to a 1024-bit secure seed to protect it from being cracked. @@ -62,9 +55,6 @@ index 0000000000000000000000000000000000000000..4dfa90e779bc6c6415dd6c587445bf33 + */ + public static boolean secureSeed = false; + public static boolean vanillaHopper = false; -+ /** -+ * zero tick plants is back now -+ */ + public static boolean zeroTickPlants = false; + + public static class cachePlayerProfileResult { @@ -78,32 +68,19 @@ index 0000000000000000000000000000000000000000..4dfa90e779bc6c6415dd6c587445bf33 + * panacea, so take precautions. + */ + public static class DSE { -+ /** -+ * Do not save tnt entities -+ */ + public static boolean primedTNT = false; -+ /** -+ * Do not save falling blocks -+ */ + public static boolean fallingBlock = false; ++ public static boolean fireworks = false; + } + + public static class Region { -+ /** -+ * Support: ANVIL (Vanilla), LINEAR, SECTORFILE -+ */ ++ // Support: ANVIL (Vanilla), LINEAR, SECTORFILE + public static Format format = Format.ANVIL; -+ /** -+ * Only SECTORFILE | Support: GZIP, ZLIB, LZ4, BROTLI (Only Tranic Server), SNAPPY (Only Tranic Server), ZSTD -+ */ ++ // Only SECTORFILE | Support: GZIP, ZLIB, LZ4, BROTLI (Only Tranic Server), SNAPPY (Only Tranic Server), ZSTD + public static Compression compressionFormat = Compression.ZSTD; -+ /** -+ * Only LINEAR | 1-15 -+ */ ++ // Only LINEAR | 1-15 + public static int compressionLevel = 1; -+ /** -+ * Only LINEAR | flush second -+ */ ++ // Only LINEAR | flush second + public static int flushFrequency = 5; + } + @@ -113,19 +90,17 @@ index 0000000000000000000000000000000000000000..4dfa90e779bc6c6415dd6c587445bf33 + * may have some adverse consequences. Please enable it with caution. + */ + public static class VirtualThread { -+ /**Virtual Thread 1.0*/ ++ // Virtual Thread 1.0 + public static boolean enabled = false; + -+ /**Virtual Thread 2.0 (Alpha)*/ ++ // Virtual Thread 2.0 (Alpha) + public static boolean vt2 = false; + } + } + + public static class Optimize { + public static int acquirePoiForStuckEntity = 60; -+ /** -+ * May cause the inconsistent order of future compose tasks. -+ */ ++ // May cause the inconsistent order of future compose tasks. + public static boolean fasterStructureGenFutureSequencing = false; + public static boolean floatingPointPositive = false; + /** @@ -133,9 +108,7 @@ index 0000000000000000000000000000000000000000..4dfa90e779bc6c6415dd6c587445bf33 + * If the entity has already determined the path, it will not search the path as frequently. + */ + public static boolean mobRePathfinding = true; -+ /** -+ * As the name suggests, it can slightly improve world generation performance, maybe. -+ */ ++ // As the name suggests, it can slightly improve world generation performance, maybe. + public static boolean noiseGeneration = true; + public static boolean skipSelfRaidCheck = false; + @@ -174,9 +147,7 @@ index 0000000000000000000000000000000000000000..4dfa90e779bc6c6415dd6c587445bf33 + } + } + -+ /** -+ * Optimize stacked minecarts -+ */ ++ // Optimize stacked minecarts + public static class Minecart { + public static boolean enabled = true; + public static int skipTickCount = 30; diff --git a/patches/server/0009-Vine-Config-Feature.patch b/patches/server/0009-Vine-Config-Feature.patch index c53167a..efd7f9d 100644 --- a/patches/server/0009-Vine-Config-Feature.patch +++ b/patches/server/0009-Vine-Config-Feature.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Vine Config - Feature diff --git a/src/main/kotlin/one/tranic/vine/config/module/feature/DontSaveEntity.kt b/src/main/kotlin/one/tranic/vine/config/module/feature/DontSaveEntity.kt new file mode 100644 -index 0000000000000000000000000000000000000000..9d7053f0d68b82ac5830881ede2cb5f99470c6ae +index 0000000000000000000000000000000000000000..657642f146baea146e6b2274052eb76afa8dae18 --- /dev/null +++ b/src/main/kotlin/one/tranic/vine/config/module/feature/DontSaveEntity.kt -@@ -0,0 +1,24 @@ +@@ -0,0 +1,26 @@ +package one.tranic.vine.config.module.feature + +import one.tranic.vine.config.VineConfig.Feature @@ -27,11 +27,13 @@ index 0000000000000000000000000000000000000000..9d7053f0d68b82ac5830881ede2cb5f9 + ) + ) + addDefault("$BASEPATH.falling-block", false) ++ addDefault("$BASEPATH.fireworks", false) + } + + override fun load() { + Feature.DSE.primedTNT = getBoolean("$BASEPATH.primed-tnt") + Feature.DSE.fallingBlock = getBoolean("$BASEPATH.falling-block") ++ Feature.DSE.fireworks = getBoolean("$BASEPATH.fireworks") + } +} \ No newline at end of file diff --git a/patches/server/0027-Don-t-save-FireworkRocket-Entity.patch b/patches/server/0027-Don-t-save-FireworkRocket-Entity.patch new file mode 100644 index 0000000..86da32d --- /dev/null +++ b/patches/server/0027-Don-t-save-FireworkRocket-Entity.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: 404Setup <153366651+404Setup@users.noreply.github.com> +Date: Mon, 9 Sep 2024 09:38:22 +0800 +Subject: [PATCH] Don't save FireworkRocket Entity + + +diff --git a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java +index 4671f34ba2796c1284af5bd9b2d2edfe37869ad6..259606755e7d3af7c31820500354a08c5923e44b 100644 +--- a/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java ++++ b/src/main/java/net/minecraft/world/entity/projectile/FireworkRocketEntity.java +@@ -354,6 +354,11 @@ public class FireworkRocketEntity extends Projectile implements ItemSupplier { + return false; + } + ++ @Override ++ public boolean shouldBeSaved() { ++ return !one.tranic.vine.config.VineConfig.Feature.DSE.fireworks; ++ } ++ + public static ItemStack getDefaultItem() { + return new ItemStack(Items.FIREWORK_ROCKET); + } diff --git a/patches/server/0027-Disable-respawn-ceiling.patch b/patches/server/0028-Disable-respawn-ceiling.patch similarity index 100% rename from patches/server/0027-Disable-respawn-ceiling.patch rename to patches/server/0028-Disable-respawn-ceiling.patch diff --git a/patches/server/0028-Store-gamerules-in-fastutil-hashmap.patch b/patches/server/0029-Store-gamerules-in-fastutil-hashmap.patch similarity index 100% rename from patches/server/0028-Store-gamerules-in-fastutil-hashmap.patch rename to patches/server/0029-Store-gamerules-in-fastutil-hashmap.patch diff --git a/patches/server/0029-disable-spark.patch b/patches/server/0030-disable-spark.patch similarity index 100% rename from patches/server/0029-disable-spark.patch rename to patches/server/0030-disable-spark.patch diff --git a/patches/server/0030-SIMD-support-range-adjustment.patch b/patches/server/0031-SIMD-support-range-adjustment.patch similarity index 100% rename from patches/server/0030-SIMD-support-range-adjustment.patch rename to patches/server/0031-SIMD-support-range-adjustment.patch diff --git a/patches/server/0031-Skip-empty-events.patch b/patches/server/0032-Skip-empty-events.patch similarity index 100% rename from patches/server/0031-Skip-empty-events.patch rename to patches/server/0032-Skip-empty-events.patch diff --git a/patches/server/0032-Leaf-Fix-MC-119417.patch b/patches/server/0033-Leaf-Fix-MC-119417.patch similarity index 100% rename from patches/server/0032-Leaf-Fix-MC-119417.patch rename to patches/server/0033-Leaf-Fix-MC-119417.patch diff --git a/patches/server/0033-Leaf-Fix-MC-266334.patch b/patches/server/0034-Leaf-Fix-MC-266334.patch similarity index 100% rename from patches/server/0033-Leaf-Fix-MC-266334.patch rename to patches/server/0034-Leaf-Fix-MC-266334.patch diff --git a/patches/server/0034-Leaf-Fix-MC-200418.patch b/patches/server/0035-Leaf-Fix-MC-200418.patch similarity index 100% rename from patches/server/0034-Leaf-Fix-MC-200418.patch rename to patches/server/0035-Leaf-Fix-MC-200418.patch diff --git a/patches/server/0035-Leaf-Fix-MC-183518.patch b/patches/server/0036-Leaf-Fix-MC-183518.patch similarity index 100% rename from patches/server/0035-Leaf-Fix-MC-183518.patch rename to patches/server/0036-Leaf-Fix-MC-183518.patch diff --git a/patches/server/0036-Leaf-Fix-sprint-glitch.patch b/patches/server/0037-Leaf-Fix-sprint-glitch.patch similarity index 100% rename from patches/server/0036-Leaf-Fix-sprint-glitch.patch rename to patches/server/0037-Leaf-Fix-sprint-glitch.patch diff --git a/patches/server/0037-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch b/patches/server/0038-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch similarity index 100% rename from patches/server/0037-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch rename to patches/server/0038-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch diff --git a/patches/server/0038-Leaf-Don-t-save-falling-block-entity.patch b/patches/server/0039-Leaf-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0038-Leaf-Don-t-save-falling-block-entity.patch rename to patches/server/0039-Leaf-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0039-Leaf-Don-t-save-primed-tnt-entity.patch b/patches/server/0040-Leaf-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0039-Leaf-Don-t-save-primed-tnt-entity.patch rename to patches/server/0040-Leaf-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0040-Leaf-Optimize-Minecart-collisions.patch b/patches/server/0041-Leaf-Optimize-Minecart-collisions.patch similarity index 100% rename from patches/server/0040-Leaf-Optimize-Minecart-collisions.patch rename to patches/server/0041-Leaf-Optimize-Minecart-collisions.patch diff --git a/patches/server/0041-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch b/patches/server/0042-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch similarity index 100% rename from patches/server/0041-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch rename to patches/server/0042-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch diff --git a/patches/server/0042-Leaf-Cache-player-profileResult.patch b/patches/server/0043-Leaf-Cache-player-profileResult.patch similarity index 100% rename from patches/server/0042-Leaf-Cache-player-profileResult.patch rename to patches/server/0043-Leaf-Cache-player-profileResult.patch diff --git a/patches/server/0043-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch b/patches/server/0044-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch similarity index 100% rename from patches/server/0043-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch rename to patches/server/0044-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch diff --git a/patches/server/0044-Leaves-Zero-tick-plants.patch b/patches/server/0045-Leaves-Zero-tick-plants.patch similarity index 100% rename from patches/server/0044-Leaves-Zero-tick-plants.patch rename to patches/server/0045-Leaves-Zero-tick-plants.patch diff --git a/patches/server/0045-Leaves-Entity-Utils.patch b/patches/server/0046-Leaves-Entity-Utils.patch similarity index 100% rename from patches/server/0045-Leaves-Entity-Utils.patch rename to patches/server/0046-Leaves-Entity-Utils.patch diff --git a/patches/server/0046-Leaves-Return-nether-portal-fix.patch b/patches/server/0047-Leaves-Return-nether-portal-fix.patch similarity index 100% rename from patches/server/0046-Leaves-Return-nether-portal-fix.patch rename to patches/server/0047-Leaves-Return-nether-portal-fix.patch diff --git a/patches/server/0047-Leaves-Vanilla-hopper.patch b/patches/server/0048-Leaves-Vanilla-hopper.patch similarity index 100% rename from patches/server/0047-Leaves-Vanilla-hopper.patch rename to patches/server/0048-Leaves-Vanilla-hopper.patch diff --git a/patches/server/0048-Leaves-Raider-die-skip-self-raid-check.patch b/patches/server/0049-Leaves-Raider-die-skip-self-raid-check.patch similarity index 100% rename from patches/server/0048-Leaves-Raider-die-skip-self-raid-check.patch rename to patches/server/0049-Leaves-Raider-die-skip-self-raid-check.patch diff --git a/patches/server/0049-Leaves-Fix-villagers-dont-release-memory.patch b/patches/server/0050-Leaves-Fix-villagers-dont-release-memory.patch similarity index 100% rename from patches/server/0049-Leaves-Fix-villagers-dont-release-memory.patch rename to patches/server/0050-Leaves-Fix-villagers-dont-release-memory.patch diff --git a/patches/server/0050-Leaves-Fix-falling-block-s-block-location.patch b/patches/server/0051-Leaves-Fix-falling-block-s-block-location.patch similarity index 100% rename from patches/server/0050-Leaves-Fix-falling-block-s-block-location.patch rename to patches/server/0051-Leaves-Fix-falling-block-s-block-location.patch diff --git a/patches/server/0051-Pufferfish-Optimize-entity-coordinate-key.patch b/patches/server/0052-Pufferfish-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0051-Pufferfish-Optimize-entity-coordinate-key.patch rename to patches/server/0052-Pufferfish-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0052-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0053-Pufferfish-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0052-Pufferfish-Improve-container-checking-with-a-bitset.patch rename to patches/server/0053-Pufferfish-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0053-Mobtimizations-RePathing-optimization.patch b/patches/server/0054-Mobtimizations-RePathing-optimization.patch similarity index 100% rename from patches/server/0053-Mobtimizations-RePathing-optimization.patch rename to patches/server/0054-Mobtimizations-RePathing-optimization.patch diff --git a/patches/server/0054-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch b/patches/server/0055-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch similarity index 100% rename from patches/server/0054-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch rename to patches/server/0055-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch diff --git a/patches/server/0055-Divine-Implement-Secure-Seed.patch b/patches/server/0056-Divine-Implement-Secure-Seed.patch similarity index 100% rename from patches/server/0055-Divine-Implement-Secure-Seed.patch rename to patches/server/0056-Divine-Implement-Secure-Seed.patch diff --git a/patches/server/0056-Divine-Fix-MC-31819.patch b/patches/server/0057-Divine-Fix-MC-31819.patch similarity index 100% rename from patches/server/0056-Divine-Fix-MC-31819.patch rename to patches/server/0057-Divine-Fix-MC-31819.patch diff --git a/patches/server/0057-Divine-Fix-MC-172801.patch b/patches/server/0058-Divine-Fix-MC-172801.patch similarity index 100% rename from patches/server/0057-Divine-Fix-MC-172801.patch rename to patches/server/0058-Divine-Fix-MC-172801.patch diff --git a/patches/server/0058-Divine-Fix-MC-2025.patch b/patches/server/0059-Divine-Fix-MC-2025.patch similarity index 100% rename from patches/server/0058-Divine-Fix-MC-2025.patch rename to patches/server/0059-Divine-Fix-MC-2025.patch diff --git a/patches/server/0059-Divine-C2ME-reduce_allocs.patch b/patches/server/0060-Divine-C2ME-reduce_allocs.patch similarity index 100% rename from patches/server/0059-Divine-C2ME-reduce_allocs.patch rename to patches/server/0060-Divine-C2ME-reduce_allocs.patch diff --git a/patches/server/0060-Divine-C2ME-opts-math.patch b/patches/server/0061-Divine-C2ME-opts-math.patch similarity index 100% rename from patches/server/0060-Divine-C2ME-opts-math.patch rename to patches/server/0061-Divine-C2ME-opts-math.patch diff --git a/patches/server/0061-Divine-Fix-MC-7569.patch b/patches/server/0062-Divine-Fix-MC-7569.patch similarity index 100% rename from patches/server/0061-Divine-Fix-MC-7569.patch rename to patches/server/0062-Divine-Fix-MC-7569.patch diff --git a/patches/server/0062-Divine-lithium-math.sine_lut.patch b/patches/server/0063-Divine-lithium-math.sine_lut.patch similarity index 100% rename from patches/server/0062-Divine-lithium-math.sine_lut.patch rename to patches/server/0063-Divine-lithium-math.sine_lut.patch diff --git a/patches/server/0063-Divine-lithium-cached_hashcode.patch b/patches/server/0064-Divine-lithium-cached_hashcode.patch similarity index 100% rename from patches/server/0063-Divine-lithium-cached_hashcode.patch rename to patches/server/0064-Divine-lithium-cached_hashcode.patch diff --git a/patches/server/0064-Divine-Fix-MC-93826.patch b/patches/server/0065-Divine-Fix-MC-93826.patch similarity index 100% rename from patches/server/0064-Divine-Fix-MC-93826.patch rename to patches/server/0065-Divine-Fix-MC-93826.patch diff --git a/patches/server/0065-Divine-Fix-MC-110386.patch b/patches/server/0066-Divine-Fix-MC-110386.patch similarity index 100% rename from patches/server/0065-Divine-Fix-MC-110386.patch rename to patches/server/0066-Divine-Fix-MC-110386.patch diff --git a/patches/server/0066-Divine-Fix-MC-98160-and-MC-105103.patch b/patches/server/0067-Divine-Fix-MC-98160-and-MC-105103.patch similarity index 100% rename from patches/server/0066-Divine-Fix-MC-98160-and-MC-105103.patch rename to patches/server/0067-Divine-Fix-MC-98160-and-MC-105103.patch diff --git a/patches/server/0067-Divine-Fix-MC-93018.patch b/patches/server/0068-Divine-Fix-MC-93018.patch similarity index 100% rename from patches/server/0067-Divine-Fix-MC-93018.patch rename to patches/server/0068-Divine-Fix-MC-93018.patch diff --git a/patches/server/0068-Divine-Fix-MC-65198.patch b/patches/server/0069-Divine-Fix-MC-65198.patch similarity index 100% rename from patches/server/0068-Divine-Fix-MC-65198.patch rename to patches/server/0069-Divine-Fix-MC-65198.patch diff --git a/patches/server/0069-Divine-Fix-MC-167242.patch b/patches/server/0070-Divine-Fix-MC-167242.patch similarity index 100% rename from patches/server/0069-Divine-Fix-MC-167242.patch rename to patches/server/0070-Divine-Fix-MC-167242.patch diff --git a/patches/server/0070-Canvas-Dont-load-chunks-to-spawn-phantoms.patch b/patches/server/0071-Canvas-Dont-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0070-Canvas-Dont-load-chunks-to-spawn-phantoms.patch rename to patches/server/0071-Canvas-Dont-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0071-Canvas-Optimize-Math.round-and-Math.hypot.patch b/patches/server/0072-Canvas-Optimize-Math.round-and-Math.hypot.patch similarity index 100% rename from patches/server/0071-Canvas-Optimize-Math.round-and-Math.hypot.patch rename to patches/server/0072-Canvas-Optimize-Math.round-and-Math.hypot.patch diff --git a/patches/server/0072-Canvas-Entity-Goal-Optimizations.patch b/patches/server/0073-Canvas-Entity-Goal-Optimizations.patch similarity index 100% rename from patches/server/0072-Canvas-Entity-Goal-Optimizations.patch rename to patches/server/0073-Canvas-Entity-Goal-Optimizations.patch diff --git a/patches/server/0073-Canvas-Optimize-Entity-Pathfinding.patch b/patches/server/0074-Canvas-Optimize-Entity-Pathfinding.patch similarity index 100% rename from patches/server/0073-Canvas-Optimize-Entity-Pathfinding.patch rename to patches/server/0074-Canvas-Optimize-Entity-Pathfinding.patch diff --git a/patches/server/0074-CarpetFix-incorrectBounceLogicFix.patch b/patches/server/0075-CarpetFix-incorrectBounceLogicFix.patch similarity index 100% rename from patches/server/0074-CarpetFix-incorrectBounceLogicFix.patch rename to patches/server/0075-CarpetFix-incorrectBounceLogicFix.patch diff --git a/patches/server/0075-CarpetFix-explosionBreaksItemFrameInWaterFix.patch b/patches/server/0076-CarpetFix-explosionBreaksItemFrameInWaterFix.patch similarity index 100% rename from patches/server/0075-CarpetFix-explosionBreaksItemFrameInWaterFix.patch rename to patches/server/0076-CarpetFix-explosionBreaksItemFrameInWaterFix.patch diff --git a/patches/server/0076-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch b/patches/server/0077-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch similarity index 100% rename from patches/server/0076-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch rename to patches/server/0077-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch diff --git a/patches/server/0077-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0078-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0077-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0078-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0078-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch b/patches/server/0079-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch similarity index 100% rename from patches/server/0078-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch rename to patches/server/0079-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch diff --git a/patches/server/0079-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch b/patches/server/0080-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch similarity index 100% rename from patches/server/0079-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch rename to patches/server/0080-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch diff --git a/patches/server/0080-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch b/patches/server/0081-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch similarity index 100% rename from patches/server/0080-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch rename to patches/server/0081-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch diff --git a/patches/server/0081-Gale-Use-platform-math-functions.patch b/patches/server/0082-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0081-Gale-Use-platform-math-functions.patch rename to patches/server/0082-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0082-Gale-Faster-floating-point-positive-modulo.patch b/patches/server/0083-Gale-Faster-floating-point-positive-modulo.patch similarity index 100% rename from patches/server/0082-Gale-Faster-floating-point-positive-modulo.patch rename to patches/server/0083-Gale-Faster-floating-point-positive-modulo.patch diff --git a/patches/server/0083-Gale-Specific-interval-TPS-API.patch b/patches/server/0084-Gale-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0083-Gale-Specific-interval-TPS-API.patch rename to patches/server/0084-Gale-Specific-interval-TPS-API.patch diff --git a/patches/server/0084-Gale-Reduce-block-destruction-packet-allocations.patch b/patches/server/0085-Gale-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0084-Gale-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0085-Gale-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0085-Gale-Optimize-matching-item-checks.patch b/patches/server/0086-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0085-Gale-Optimize-matching-item-checks.patch rename to patches/server/0086-Gale-Optimize-matching-item-checks.patch diff --git a/patches/server/0086-Gale-Store-mob-counts-in-an-array.patch b/patches/server/0087-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0086-Gale-Store-mob-counts-in-an-array.patch rename to patches/server/0087-Gale-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0087-Gale-For-collision-check-has-physics-before-same-veh.patch b/patches/server/0088-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 100% rename from patches/server/0087-Gale-For-collision-check-has-physics-before-same-veh.patch rename to patches/server/0088-Gale-For-collision-check-has-physics-before-same-veh.patch diff --git a/patches/server/0088-Gale-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0089-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0088-Gale-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0089-Gale-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0089-Gale-Pre-compute-VarLong-sizes.patch b/patches/server/0090-Gale-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0089-Gale-Pre-compute-VarLong-sizes.patch rename to patches/server/0090-Gale-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0090-Gale-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0091-Gale-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from patches/server/0090-Gale-Optimize-VarInt-write-and-VarLong-write.patch rename to patches/server/0091-Gale-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/patches/server/0091-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0092-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0091-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0092-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0092-Gale-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0093-Gale-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0092-Gale-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0093-Gale-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0093-MemoryLeakFix-Biome.patch b/patches/server/0094-MemoryLeakFix-Biome.patch similarity index 100% rename from patches/server/0093-MemoryLeakFix-Biome.patch rename to patches/server/0094-MemoryLeakFix-Biome.patch diff --git a/patches/server/0094-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch b/patches/server/0095-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch similarity index 100% rename from patches/server/0094-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch rename to patches/server/0095-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch diff --git a/patches/server/0095-Paper-Update-Alternate-Current-to-v1.9.patch b/patches/server/0096-Paper-Update-Alternate-Current-to-v1.9.patch similarity index 100% rename from patches/server/0095-Paper-Update-Alternate-Current-to-v1.9.patch rename to patches/server/0096-Paper-Update-Alternate-Current-to-v1.9.patch diff --git a/patches/server/0096-Paper-PR-Update-Velocity-natives.patch b/patches/server/0097-Paper-PR-Update-Velocity-natives.patch similarity index 89% rename from patches/server/0096-Paper-PR-Update-Velocity-natives.patch rename to patches/server/0097-Paper-PR-Update-Velocity-natives.patch index 3263d9d..e15c837 100644 --- a/patches/server/0096-Paper-PR-Update-Velocity-natives.patch +++ b/patches/server/0097-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 4777451dc9378f1bed1c5f663cf444dabe42ff4e..0b808e2d4fa6bd403799cc07ba2fc952fef94c2e 100644 +index b93eb251d0c37840239381d8d0078a92b898ec1e..cd75c11712bc2c7b03d5e4d2537d0c23815ea5a2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ dependencies { diff --git a/patches/server/0097-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0098-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch similarity index 100% rename from patches/server/0097-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch rename to patches/server/0098-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch diff --git a/patches/server/0098-Paper-PR-Change-condition-check-order-of-entity-trac.patch b/patches/server/0099-Paper-PR-Change-condition-check-order-of-entity-trac.patch similarity index 100% rename from patches/server/0098-Paper-PR-Change-condition-check-order-of-entity-trac.patch rename to patches/server/0099-Paper-PR-Change-condition-check-order-of-entity-trac.patch diff --git a/patches/server/0099-Paper-PR-Fix-fetching-biomes-during-world-generation.patch b/patches/server/0100-Paper-PR-Fix-fetching-biomes-during-world-generation.patch similarity index 100% rename from patches/server/0099-Paper-PR-Fix-fetching-biomes-during-world-generation.patch rename to patches/server/0100-Paper-PR-Fix-fetching-biomes-during-world-generation.patch diff --git a/patches/server/0100-lithium-precompute-shape-arrays.patch b/patches/server/0101-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0100-lithium-precompute-shape-arrays.patch rename to patches/server/0101-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0101-lithium-fast-powder-snow-check.patch b/patches/server/0102-lithium-fast-powder-snow-check.patch similarity index 100% rename from patches/server/0101-lithium-fast-powder-snow-check.patch rename to patches/server/0102-lithium-fast-powder-snow-check.patch diff --git a/patches/server/0102-vmp-TypeFilterableList.patch b/patches/server/0103-vmp-TypeFilterableList.patch similarity index 100% rename from patches/server/0102-vmp-TypeFilterableList.patch rename to patches/server/0103-vmp-TypeFilterableList.patch diff --git a/patches/server/0103-vmp-skip-entity-move-if-movement-is-zero.patch b/patches/server/0104-vmp-skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0103-vmp-skip-entity-move-if-movement-is-zero.patch rename to patches/server/0104-vmp-skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0104-Slice-Improve-map-saving-performance.patch b/patches/server/0105-Slice-Improve-map-saving-performance.patch similarity index 100% rename from patches/server/0104-Slice-Improve-map-saving-performance.patch rename to patches/server/0105-Slice-Improve-map-saving-performance.patch diff --git a/patches/server/0105-Slice-noEntityCollisions-for-Entity.patch b/patches/server/0106-Slice-noEntityCollisions-for-Entity.patch similarity index 100% rename from patches/server/0105-Slice-noEntityCollisions-for-Entity.patch rename to patches/server/0106-Slice-noEntityCollisions-for-Entity.patch diff --git a/patches/server/0106-Slice-Allow-inventory-clicks-in-Spectator.patch b/patches/server/0107-Slice-Allow-inventory-clicks-in-Spectator.patch similarity index 100% rename from patches/server/0106-Slice-Allow-inventory-clicks-in-Spectator.patch rename to patches/server/0107-Slice-Allow-inventory-clicks-in-Spectator.patch diff --git a/patches/server/0107-Slice-Disable-sending-Entity-Movement-Packets.patch b/patches/server/0108-Slice-Disable-sending-Entity-Movement-Packets.patch similarity index 100% rename from patches/server/0107-Slice-Disable-sending-Entity-Movement-Packets.patch rename to patches/server/0108-Slice-Disable-sending-Entity-Movement-Packets.patch diff --git a/patches/server/0108-Akarin-Save-Json-list-asynchronously.patch b/patches/server/0109-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from patches/server/0108-Akarin-Save-Json-list-asynchronously.patch rename to patches/server/0109-Akarin-Save-Json-list-asynchronously.patch diff --git a/patches/server/0109-Airplane-Remove-stream-in-PoiCompetitorScan.patch b/patches/server/0110-Airplane-Remove-stream-in-PoiCompetitorScan.patch similarity index 100% rename from patches/server/0109-Airplane-Remove-stream-in-PoiCompetitorScan.patch rename to patches/server/0110-Airplane-Remove-stream-in-PoiCompetitorScan.patch diff --git a/patches/server/0110-ScalableLux-Upstream-Starlight-Fix.patch b/patches/server/0111-ScalableLux-Upstream-Starlight-Fix.patch similarity index 100% rename from patches/server/0110-ScalableLux-Upstream-Starlight-Fix.patch rename to patches/server/0111-ScalableLux-Upstream-Starlight-Fix.patch diff --git a/patches/server/0111-Kiterino-New-liquid-physics.patch b/patches/server/0112-Kiterino-New-liquid-physics.patch similarity index 100% rename from patches/server/0111-Kiterino-New-liquid-physics.patch rename to patches/server/0112-Kiterino-New-liquid-physics.patch