diff --git a/patches/server/0072-Make-sand-duping-fix-configurable.patch b/patches/server/0072-Make-sand-duping-fix-configurable.patch index 79a49a0..e1d27ea 100644 --- a/patches/server/0072-Make-sand-duping-fix-configurable.patch +++ b/patches/server/0072-Make-sand-duping-fix-configurable.patch @@ -59,7 +59,7 @@ index 18eaccb39a4c81338a8cbebe3de03934913ac2a4..a1466d29b896c06f67a6f110270377fd } // Paper end - fix sand duping diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index b3822132cbb34dde90754aa2ee5439433ea4df4b..4f358cc6e6af29addd151ed521d8e1be5655d991 100644 +index b3822132cbb34dde90754aa2ee5439433ea4df4b..636892ac5af6b4c1989c12cf15b75d965f60512a 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -274,6 +274,13 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -71,7 +71,7 @@ index b3822132cbb34dde90754aa2ee5439433ea4df4b..4f358cc6e6af29addd151ed521d8e1be + public class Fixes extends ConfigurationPart { + + public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable -+ ++ + } public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable diff --git a/patches/server/0073-Make-tripwire-duping-fix-configurable.patch b/patches/server/0073-Make-tripwire-duping-fix-configurable.patch new file mode 100644 index 0000000..158922c --- /dev/null +++ b/patches/server/0073-Make-tripwire-duping-fix-configurable.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> +Date: Sun, 6 Nov 2022 04:32:27 -0500 +Subject: [PATCH] Make tripwire duping fix configurable + +License: MIT (https://opensource.org/licenses/MIT) +Leaf - https://github.com/Winds-Studio/Leaf + +diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java +index cb2ff8d94308c637a498d2737f86f6af4c9c1b83..eb1ecbbb5c0f887ee1c7de85a6137f2f182b3fc0 100644 +--- a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java +@@ -78,7 +78,7 @@ public class TripWireBlock extends Block { + public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean moved) { + if (io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates) return; // Paper - prevent adjacent tripwires from updating + if (!moved && !state.is(newState.getBlock())) { +- this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), true); // Paper - fix state inconsistency ++ this.updateSource(world, pos, (BlockState) state.setValue(TripWireBlock.POWERED, true), world.galeConfig().gameplayMechanics.fixes.tripwireDuping); // Paper - fix state inconsistency // Gale - Leaf - make tripwire duping fix configurable + } + } + +diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +index 636892ac5af6b4c1989c12cf15b75d965f60512a..18a4ab9f8549fac95d703d9fff4b74e4ae6a9b4f 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +@@ -279,6 +279,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public class Fixes extends ConfigurationPart { + + public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable ++ public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable + + } + diff --git a/patches/server/0073-Fix-MC-238526.patch b/patches/server/0074-Fix-MC-238526.patch similarity index 93% rename from patches/server/0073-Fix-MC-238526.patch rename to patches/server/0074-Fix-MC-238526.patch index 1d70d6b..b8c06a4 100644 --- a/patches/server/0073-Fix-MC-238526.patch +++ b/patches/server/0074-Fix-MC-238526.patch @@ -49,15 +49,13 @@ index cd2ce5bcb8c30e4657cd0e340d80544c7e805905..db3574e4ec9bad32bbbcd9d7ab9607da } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 4f358cc6e6af29addd151ed521d8e1be5655d991..32b9b7ab76fbb2acac9c27c49a27b5dd3134876b 100644 +index 18a4ab9f8549fac95d703d9fff4b74e4ae6a9b4f..1c3624965d9fc1acb406014e3001a0a4920afd2c 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -279,7 +279,12 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public class Fixes extends ConfigurationPart { - +@@ -281,6 +281,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable -- -+ + public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable + + // Gale start - Purpur - fix MC-238526 + @Setting("mc-238526") + public boolean mc238526 = false; diff --git a/patches/server/0074-Fix-cow-rotation-when-shearing-mooshroom.patch b/patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch similarity index 93% rename from patches/server/0074-Fix-cow-rotation-when-shearing-mooshroom.patch rename to patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch index 4f2bff4..255cccd 100644 --- a/patches/server/0074-Fix-cow-rotation-when-shearing-mooshroom.patch +++ b/patches/server/0075-Fix-cow-rotation-when-shearing-mooshroom.patch @@ -64,16 +64,14 @@ index a04374f91f2fbb31219d86b6ae63bcf8fdf7318c..e3b92e8b2274ee6d07d1e9c74f669aea entitycow.setPersistenceRequired(); } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 32b9b7ab76fbb2acac9c27c49a27b5dd3134876b..f066a6ae227d2d8c064b48529e580c9b84a16ca3 100644 +index 1c3624965d9fc1acb406014e3001a0a4920afd2c..578f393ab5c4088ed1f60d39b908968f3507b651 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -279,7 +279,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public class Fixes extends ConfigurationPart { +@@ -280,6 +280,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable -- + public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable + public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom -+ + // Gale start - Purpur - fix MC-238526 @Setting("mc-238526") - public boolean mc238526 = false; diff --git a/patches/server/0075-Fix-MC-121706.patch b/patches/server/0076-Fix-MC-121706.patch similarity index 88% rename from patches/server/0075-Fix-MC-121706.patch rename to patches/server/0076-Fix-MC-121706.patch index 096831e..413d68e 100644 --- a/patches/server/0075-Fix-MC-121706.patch +++ b/patches/server/0076-Fix-MC-121706.patch @@ -65,17 +65,10 @@ index 87fb10096fc9dade33c663234b1cecc34d3d77bb..cb2c6dcdd2be476d0434e7f771bbb251 } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f066a6ae227d2d8c064b48529e580c9b84a16ca3..db4ce11c838dbc718a82abce2376a54259617ae2 100644 +index 578f393ab5c4088ed1f60d39b908968f3507b651..98355899e6307bc9471e2af247e8f3286a86e6dc 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -280,12 +280,17 @@ public class GaleWorldConfiguration extends ConfigurationPart { - - public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable - public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom -- -+ - // Gale start - Purpur - fix MC-238526 - @Setting("mc-238526") +@@ -287,6 +287,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc238526 = false; // Gale end - Purpur - fix MC-238526 diff --git a/patches/server/0076-Fix-MC-110386.patch b/patches/server/0077-Fix-MC-110386.patch similarity index 93% rename from patches/server/0076-Fix-MC-110386.patch rename to patches/server/0077-Fix-MC-110386.patch index 782bdc1..01ff47b 100644 --- a/patches/server/0076-Fix-MC-110386.patch +++ b/patches/server/0077-Fix-MC-110386.patch @@ -35,10 +35,10 @@ index 80ef4b6649da3049f21624926fa38595d76c5da5..7ce47abc44e0dfe8ff90afeb25b14d8d } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index db4ce11c838dbc718a82abce2376a54259617ae2..a1b69f5815c212312dfef696017ec06d86fd7e36 100644 +index 98355899e6307bc9471e2af247e8f3286a86e6dc..1a5d249268fc09a5117193d0f351676e9a083e16 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -291,6 +291,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -292,6 +292,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc121706 = false; // Gale end - Purpur - fix MC-121706 diff --git a/patches/server/0077-Fix-MC-31819.patch b/patches/server/0078-Fix-MC-31819.patch similarity index 94% rename from patches/server/0077-Fix-MC-31819.patch rename to patches/server/0078-Fix-MC-31819.patch index f6f60fe..2278a3b 100644 --- a/patches/server/0077-Fix-MC-31819.patch +++ b/patches/server/0078-Fix-MC-31819.patch @@ -35,10 +35,10 @@ index 58152160d609d0e9d105153aeb166a56a7955603..6a906b1f37e52472527e9f19e965be9f if (!this.abilities.invulnerable) { if (!this.level().isClientSide) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index a1b69f5815c212312dfef696017ec06d86fd7e36..60a8ef0c4f3fd95b9d7f6b850b2ae6aacdcc5221 100644 +index 1a5d249268fc09a5117193d0f351676e9a083e16..b6df6cb577536b8ab1fcceeae4b8627adef21e20 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -296,6 +296,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -297,6 +297,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc110386 = true; // Gale end - Mirai - fix MC-110386 diff --git a/patches/server/0078-Fix-MC-26304.patch b/patches/server/0079-Fix-MC-26304.patch similarity index 100% rename from patches/server/0078-Fix-MC-26304.patch rename to patches/server/0079-Fix-MC-26304.patch diff --git a/patches/server/0079-End-gateway-should-check-if-entity-can-use-portal.patch b/patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch similarity index 93% rename from patches/server/0079-End-gateway-should-check-if-entity-can-use-portal.patch rename to patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch index 2418d0b..45f25f8 100644 --- a/patches/server/0079-End-gateway-should-check-if-entity-can-use-portal.patch +++ b/patches/server/0080-End-gateway-should-check-if-entity-can-use-portal.patch @@ -49,12 +49,12 @@ index d9baa85962236c42219cf09d4f3129be93ff069c..414a47a82927bed02a4f3cf330c78e46 blockEntity.teleportCooldown = 100; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 60a8ef0c4f3fd95b9d7f6b850b2ae6aacdcc5221..d3c567390d3e9acb8f69aba16d5eb270f971eaeb 100644 +index b6df6cb577536b8ab1fcceeae4b8627adef21e20..1b5367474c69b2073a643287a29e0beda4a9f08a 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -280,6 +280,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { - +@@ -281,6 +281,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable + public boolean tripwireDuping = true; // Gale - Leaf - make tripwire duping fix configurable public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom + public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal diff --git a/patches/server/0080-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 97% rename from patches/server/0080-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch index ce3182b..7613e24 100644 --- a/patches/server/0080-Make-arrow-movement-resetting-despawn-counter-config.patch +++ b/patches/server/0081-Make-arrow-movement-resetting-despawn-counter-config.patch @@ -55,7 +55,7 @@ index 7226be19248a1ffb8ff2c89b55882529d33a6c0c..cff4d09af11d1741bf3301b457555d71 @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index d3c567390d3e9acb8f69aba16d5eb270f971eaeb..f6ac2c897f63737baecbefdb7cf22302b7a31b68 100644 +index 1b5367474c69b2073a643287a29e0beda4a9f08a..c57275584b56d9d32d4b5f303423ffeb1de19854 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -274,7 +274,9 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0081-Make-logging-login-locations-configurable.patch b/patches/server/0082-Make-logging-login-locations-configurable.patch similarity index 100% rename from patches/server/0081-Make-logging-login-locations-configurable.patch rename to patches/server/0082-Make-logging-login-locations-configurable.patch diff --git a/patches/server/0082-Reduce-array-allocations.patch b/patches/server/0083-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0082-Reduce-array-allocations.patch rename to patches/server/0083-Reduce-array-allocations.patch diff --git a/patches/server/0083-Optimize-sun-burn-tick.patch b/patches/server/0084-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0083-Optimize-sun-burn-tick.patch rename to patches/server/0084-Optimize-sun-burn-tick.patch diff --git a/patches/server/0084-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0085-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0084-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0085-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0085-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0086-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0085-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0086-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0086-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0087-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0086-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0087-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0087-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0088-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0087-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0088-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0088-Replace-class-map-with-optimized-collection.patch b/patches/server/0089-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0088-Replace-class-map-with-optimized-collection.patch rename to patches/server/0089-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0089-Replace-throttle-tracker-map-with-optimized-collecti.patch b/patches/server/0090-Replace-throttle-tracker-map-with-optimized-collecti.patch similarity index 100% rename from patches/server/0089-Replace-throttle-tracker-map-with-optimized-collecti.patch rename to patches/server/0090-Replace-throttle-tracker-map-with-optimized-collecti.patch diff --git a/patches/server/0090-Replace-shape-full-block-cache-with-hashtable.patch b/patches/server/0091-Replace-shape-full-block-cache-with-hashtable.patch similarity index 100% rename from patches/server/0090-Replace-shape-full-block-cache-with-hashtable.patch rename to patches/server/0091-Replace-shape-full-block-cache-with-hashtable.patch diff --git a/patches/server/0091-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0092-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0091-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0092-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0092-Cache-BlockStatePairKey-hash.patch b/patches/server/0093-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0092-Cache-BlockStatePairKey-hash.patch rename to patches/server/0093-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0093-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0094-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0093-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0094-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0094-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0095-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0094-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0095-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0095-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0096-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0095-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0096-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0096-Check-frozen-ticks-before-landing-block.patch b/patches/server/0097-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0096-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0097-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0097-Faster-chunk-serialization.patch b/patches/server/0098-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0097-Faster-chunk-serialization.patch rename to patches/server/0098-Faster-chunk-serialization.patch diff --git a/patches/server/0098-Update-boss-bar-within-tick.patch b/patches/server/0099-Update-boss-bar-within-tick.patch similarity index 100% rename from patches/server/0098-Update-boss-bar-within-tick.patch rename to patches/server/0099-Update-boss-bar-within-tick.patch diff --git a/patches/server/0099-Cache-ominous-banner-item.patch b/patches/server/0100-Cache-ominous-banner-item.patch similarity index 100% rename from patches/server/0099-Cache-ominous-banner-item.patch rename to patches/server/0100-Cache-ominous-banner-item.patch diff --git a/patches/server/0100-Optimize-world-generation-chunk-and-block-access.patch b/patches/server/0101-Optimize-world-generation-chunk-and-block-access.patch similarity index 100% rename from patches/server/0100-Optimize-world-generation-chunk-and-block-access.patch rename to patches/server/0101-Optimize-world-generation-chunk-and-block-access.patch diff --git a/patches/server/0101-Cache-world-generator-sea-level.patch b/patches/server/0102-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0101-Cache-world-generator-sea-level.patch rename to patches/server/0102-Cache-world-generator-sea-level.patch diff --git a/patches/server/0102-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0103-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0102-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0103-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0103-Optimize-villager-data-storage.patch b/patches/server/0104-Optimize-villager-data-storage.patch similarity index 100% rename from patches/server/0103-Optimize-villager-data-storage.patch rename to patches/server/0104-Optimize-villager-data-storage.patch diff --git a/patches/server/0104-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0105-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0104-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0105-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0105-Store-mob-counts-in-an-array.patch b/patches/server/0106-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0105-Store-mob-counts-in-an-array.patch rename to patches/server/0106-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0106-Use-linked-map-for-entity-trackers.patch b/patches/server/0107-Use-linked-map-for-entity-trackers.patch similarity index 100% rename from patches/server/0106-Use-linked-map-for-entity-trackers.patch rename to patches/server/0107-Use-linked-map-for-entity-trackers.patch diff --git a/patches/server/0107-Optimize-noise-generation.patch b/patches/server/0108-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0107-Optimize-noise-generation.patch rename to patches/server/0108-Optimize-noise-generation.patch diff --git a/patches/server/0108-Optimize-sheep-offspring-color.patch b/patches/server/0109-Optimize-sheep-offspring-color.patch similarity index 98% rename from patches/server/0108-Optimize-sheep-offspring-color.patch rename to patches/server/0109-Optimize-sheep-offspring-color.patch index 7c992e7..f0c0793 100644 --- a/patches/server/0108-Optimize-sheep-offspring-color.patch +++ b/patches/server/0109-Optimize-sheep-offspring-color.patch @@ -110,7 +110,7 @@ index c0e89262c596fbdd0bb3c3f76baccb17a1bb5fcd..d8f99e1221609d481ee79ee31f645731 DyeColor enumcolor1 = ((Sheep) secondParent).getColor(); CraftingContainer inventorycrafting = Sheep.makeContainer(enumcolor, enumcolor1); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index f6ac2c897f63737baecbefdb7cf22302b7a31b68..3bf1b9a5bb3c974025d4f1f3827fca39141df684 100644 +index c57275584b56d9d32d4b5f303423ffeb1de19854..7be0e4c7a54e858db93a6ac45517533d4b040a8c 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -47,6 +47,21 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0109-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0110-Hide-flames-on-entities-with-fire-resistance.patch similarity index 96% rename from patches/server/0109-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0110-Hide-flames-on-entities-with-fire-resistance.patch index b3a9fdd..b430335 100644 --- a/patches/server/0109-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0110-Hide-flames-on-entities-with-fire-resistance.patch @@ -31,7 +31,7 @@ index 38e24fbc55d36d1e5529e3ff0315b2408cdb99a9..0b22993d2f6bdc6a096626ae76dac243 this.firstTick = false; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 3bf1b9a5bb3c974025d4f1f3827fca39141df684..6e5ca5cd9762fa2ca0b91fb290eac72890693643 100644 +index 7be0e4c7a54e858db93a6ac45517533d4b040a8c..392e0c346ee9f11d21bcc78c5c59f2baab5f391d 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -291,6 +291,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0110-Skip-cloning-advancement-criteria.patch b/patches/server/0111-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0110-Skip-cloning-advancement-criteria.patch rename to patches/server/0111-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0111-Reduce-block-destruction-packet-allocations.patch b/patches/server/0112-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0111-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0112-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0112-Spread-out-sending-all-player-info.patch b/patches/server/0113-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0112-Spread-out-sending-all-player-info.patch rename to patches/server/0113-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0113-Optimize-player-list-for-sending-player-info.patch b/patches/server/0114-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0113-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0114-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0114-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0115-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0115-Send-multiple-keep-alive-packets.patch b/patches/server/0116-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0115-Send-multiple-keep-alive-packets.patch rename to patches/server/0116-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0116-Make-slow-login-timeout-configurable.patch b/patches/server/0117-Make-slow-login-timeout-configurable.patch similarity index 100% rename from patches/server/0116-Make-slow-login-timeout-configurable.patch rename to patches/server/0117-Make-slow-login-timeout-configurable.patch diff --git a/patches/server/0117-Make-max-interaction-distance-configurable.patch b/patches/server/0118-Make-max-interaction-distance-configurable.patch similarity index 98% rename from patches/server/0117-Make-max-interaction-distance-configurable.patch rename to patches/server/0118-Make-max-interaction-distance-configurable.patch index a4816fd..88daf53 100644 --- a/patches/server/0117-Make-max-interaction-distance-configurable.patch +++ b/patches/server/0118-Make-max-interaction-distance-configurable.patch @@ -86,7 +86,7 @@ index d025232b43af3cb8dc28dff2e3e05c72e490901d..06d75d94af6aff29d542d0c5e150d8f7 public void spawnDustParticles(Level world, BlockHitResult hitResult, BlockState state, Vec3 userRotation, HumanoidArm arm) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 6e5ca5cd9762fa2ca0b91fb290eac72890693643..db9d461a05fb253ee4f1273e0fb9015c6c46a4bf 100644 +index 392e0c346ee9f11d21bcc78c5c59f2baab5f391d..243a76badb7e09ce4dcf7d5dd8ed57d55768b341 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -271,7 +271,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { @@ -119,7 +119,7 @@ index 6e5ca5cd9762fa2ca0b91fb290eac72890693643..db9d461a05fb253ee4f1273e0fb9015c public Fixes fixes; public class Fixes extends ConfigurationPart { -@@ -324,6 +338,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -325,6 +339,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable diff --git a/patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch similarity index 95% rename from patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch rename to patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch index 11fc1f2..4a23d5c 100644 --- a/patches/server/0118-Load-portal-destination-chunk-before-entity-teleport.patch +++ b/patches/server/0119-Load-portal-destination-chunk-before-entity-teleport.patch @@ -31,10 +31,10 @@ index 0b22993d2f6bdc6a096626ae76dac2433293fa14..ccb2722e8025b97d972cafac5258676c entity.moveTo(position.x, position.y, position.z, yaw, pitch); // Paper - use EntityPortalExitEvent values entity.setDeltaMovement(velocity); // Paper - use EntityPortalExitEvent values diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index db9d461a05fb253ee4f1273e0fb9015c6c46a4bf..9213aafac5b3b5718c93c910212f8b77a4b22ea3 100644 +index 243a76badb7e09ce4dcf7d5dd8ed57d55768b341..6f019ba3e732988ce60cbaa0e5494791c78ec21a 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -338,6 +338,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -339,6 +339,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean tryRespawnEnderDragonAfterEndCrystalPlace = true; // Gale - Pufferfish - make ender dragon respawn attempt after placing end crystals configurable diff --git a/patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch b/patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch similarity index 97% rename from patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch rename to patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch index fcfafac..26bf05f 100644 --- a/patches/server/0119-Don-t-load-chunks-to-spawn-phantoms.patch +++ b/patches/server/0120-Don-t-load-chunks-to-spawn-phantoms.patch @@ -34,7 +34,7 @@ index dfeb3e336e06ef01f5401a362755030db942bb07..518b40a27a8d4d015caa7e67d3558396 if (NaturalSpawner.isValidEmptySpawnBlock(world, blockposition1, iblockdata, fluid, EntityType.PHANTOM)) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 9213aafac5b3b5718c93c910212f8b77a4b22ea3..da2e77eed5d75fa0aadc0c12d13f37a0de9d64bc 100644 +index 6f019ba3e732988ce60cbaa0e5494791c78ec21a..e20a48ef23e3eb186f6564102c9146de206282c3 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -268,6 +268,23 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 98% rename from patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch index 2776220..74c7ede 100644 --- a/patches/server/0120-Don-t-load-chunks-to-activate-climbing-entities.patch +++ b/patches/server/0121-Don-t-load-chunks-to-activate-climbing-entities.patch @@ -79,7 +79,7 @@ index 2f252bbe2946ea3228933b4b8c91a4e46fe99705..a35891723fad4fe984566c41cdd72800 if (iblockdata.is(BlockTags.CLIMBABLE)) { this.lastClimbablePos = Optional.of(blockposition); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index da2e77eed5d75fa0aadc0c12d13f37a0de9d64bc..6a804c026bd4c03462a3031338296a898b5356ef 100644 +index e20a48ef23e3eb186f6564102c9146de206282c3..589ba88b01f23ba9d0b2396e03b0885e88302ab5 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -283,6 +283,18 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch b/patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch similarity index 96% rename from patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch rename to patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch index c4e469c..c89e2ec 100644 --- a/patches/server/0121-Broadcast-crit-animations-as-the-entity-being-critte.patch +++ b/patches/server/0122-Broadcast-crit-animations-as-the-entity-being-critte.patch @@ -38,10 +38,10 @@ index 9c99384dac31b94d62d129868ad6f0131dd7bd16..8e216eaafb1b90d4fd373a4384ecff0b @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 6a804c026bd4c03462a3031338296a898b5356ef..d80c55aa3d256e1fe7e4dc8dfe26110acd74711a 100644 +index 589ba88b01f23ba9d0b2396e03b0885e88302ab5..faf9ece6dfea15efaae6d7d6501e3a0ae47aed59 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -343,6 +343,22 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -344,6 +344,22 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean keepMooshroomRotationAfterShearing = true; // Gale - Purpur - fix cow rotation when shearing mooshroom public boolean checkCanChangeDimensionsBeforeUseEndGateway = false; // Gale - Purpur - end gateway should check if entity can use portal diff --git a/patches/server/0122-Ignore-null-legacy-structure-data.patch b/patches/server/0123-Ignore-null-legacy-structure-data.patch similarity index 100% rename from patches/server/0122-Ignore-null-legacy-structure-data.patch rename to patches/server/0123-Ignore-null-legacy-structure-data.patch diff --git a/patches/server/0123-Skip-unnecessary-mob-spawning-computations.patch b/patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch similarity index 100% rename from patches/server/0123-Skip-unnecessary-mob-spawning-computations.patch rename to patches/server/0124-Skip-unnecessary-mob-spawning-computations.patch diff --git a/patches/server/0124-Prevent-entities-random-strolling-into-non-ticking-c.patch b/patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 96% rename from patches/server/0124-Prevent-entities-random-strolling-into-non-ticking-c.patch rename to patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch index 4f0629e..5b3d5a3 100644 --- a/patches/server/0124-Prevent-entities-random-strolling-into-non-ticking-c.patch +++ b/patches/server/0125-Prevent-entities-random-strolling-into-non-ticking-c.patch @@ -36,7 +36,7 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..39035605197bad2eb2fd0c4942c5d43b } else { this.wantedX = vec3.x; diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index d80c55aa3d256e1fe7e4dc8dfe26110acd74711a..6e848778dc729d7ae5960c3f3098fc20711758a4 100644 +index faf9ece6dfea15efaae6d7d6501e3a0ae47aed59..0c8a2a18da5b86bd5b20d83b3a705651362cf870 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -319,6 +319,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0125-Do-not-place-player-in-world-if-kicked-before-being-.patch b/patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch similarity index 100% rename from patches/server/0125-Do-not-place-player-in-world-if-kicked-before-being-.patch rename to patches/server/0126-Do-not-place-player-in-world-if-kicked-before-being-.patch diff --git a/patches/server/0126-CraftBukkit-UUID-to-world-map.patch b/patches/server/0127-CraftBukkit-UUID-to-world-map.patch similarity index 100% rename from patches/server/0126-CraftBukkit-UUID-to-world-map.patch rename to patches/server/0127-CraftBukkit-UUID-to-world-map.patch diff --git a/patches/server/0127-Global-EULA-file.patch b/patches/server/0128-Global-EULA-file.patch similarity index 100% rename from patches/server/0127-Global-EULA-file.patch rename to patches/server/0128-Global-EULA-file.patch diff --git a/patches/server/0128-Specific-interval-TPS-API.patch b/patches/server/0129-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0128-Specific-interval-TPS-API.patch rename to patches/server/0129-Specific-interval-TPS-API.patch diff --git a/patches/server/0129-5-second-TPS-average.patch b/patches/server/0130-5-second-TPS-average.patch similarity index 100% rename from patches/server/0129-5-second-TPS-average.patch rename to patches/server/0130-5-second-TPS-average.patch diff --git a/patches/server/0130-Measure-last-tick-time.patch b/patches/server/0131-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0130-Measure-last-tick-time.patch rename to patches/server/0131-Measure-last-tick-time.patch diff --git a/patches/server/0131-Last-tick-time-API.patch b/patches/server/0132-Last-tick-time-API.patch similarity index 100% rename from patches/server/0131-Last-tick-time-API.patch rename to patches/server/0132-Last-tick-time-API.patch diff --git a/patches/server/0132-Show-last-tick-time-in-tps-command.patch b/patches/server/0133-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0132-Show-last-tick-time-in-tps-command.patch rename to patches/server/0133-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0133-Increase-time-statistics-in-intervals.patch b/patches/server/0134-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0133-Increase-time-statistics-in-intervals.patch rename to patches/server/0134-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0134-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0134-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0135-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0135-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0136-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0135-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0136-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0136-Optimize-matching-item-checks.patch b/patches/server/0137-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0136-Optimize-matching-item-checks.patch rename to patches/server/0137-Optimize-matching-item-checks.patch diff --git a/patches/server/0137-Reduce-RandomSource-instances.patch b/patches/server/0138-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0137-Reduce-RandomSource-instances.patch rename to patches/server/0138-Reduce-RandomSource-instances.patch diff --git a/patches/server/0138-Server-thread-priority-environment-variable.patch b/patches/server/0139-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0138-Server-thread-priority-environment-variable.patch rename to patches/server/0139-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0139-Instantly-continue-on-world-upgrade-finish.patch b/patches/server/0140-Instantly-continue-on-world-upgrade-finish.patch similarity index 100% rename from patches/server/0139-Instantly-continue-on-world-upgrade-finish.patch rename to patches/server/0140-Instantly-continue-on-world-upgrade-finish.patch