diff --git a/patches/server/0062-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch b/patches/server/0062-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch new file mode 100644 index 0000000..d10593f --- /dev/null +++ b/patches/server/0062-Prevent-entities-eating-blocks-in-non-ticking-chunks.patch @@ -0,0 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Wed, 30 Nov 2022 23:16:04 +0100 +Subject: [PATCH] Prevent entities eating blocks in non-ticking chunks + +License: MIT (https://opensource.org/licenses/MIT) + +This patch is based on the following patch: +"Dont eat blocks in non ticking chunks" +By: BillyGalbreath +As part of: Purpur (https://github.com/PurpurMC/Purpur) +Licensed under: MIT (https://opensource.org/licenses/MIT) + +diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java +index 80aa539f7c6a6ee44338de084cdcdf5fb4ef996a..cb8fc8a88c14d2374a0bbe35aa1c2056d625b71c 100644 +--- a/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java ++++ b/src/main/java/net/minecraft/world/entity/ai/goal/EatBlockGoal.java +@@ -31,10 +31,16 @@ public class EatBlockGoal extends Goal { + + @Override + public boolean canUse() { ++ // Gale start - Purpur - prevent entities eating blocks in non-ticking chunks ++ BlockPos blockposition = this.mob.blockPosition; ++ net.minecraft.world.level.chunk.LevelChunk chunk = this.mob.level.getChunkIfLoaded(blockposition); ++ if (this.mob.level.galeConfig().gameplayMechanics.entitiesCanEatBlocksInNonTickingChunks && (chunk == null || chunk.playerChunk == null || !((net.minecraft.server.level.ServerLevel) this.mob.level).isPositionEntityTicking(blockposition))) { ++ return false; ++ } ++ // Gale end - Purpur - prevent entities eating blocks in non-ticking chunks + if (this.mob.getRandom().nextInt(this.mob.isBaby() ? 50 : 1000) != 0) { + return false; + } else { +- BlockPos blockposition = this.mob.blockPosition(); + + return EatBlockGoal.IS_TALL_GRASS.test(this.level.getBlockState(blockposition)) ? true : this.level.getBlockState(blockposition.below()).is(Blocks.GRASS_BLOCK); + } +diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +index 3b023cbd132c6aa263dbbe54ed7d30e1049d3875..9470f4fcca253e722c4120fbab12da3959de60ab 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +@@ -244,6 +244,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public GameplayMechanics gameplayMechanics; + public class GameplayMechanics extends ConfigurationPart { + ++ public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks ++ + public Fixes fixes; + public class Fixes extends ConfigurationPart { + diff --git a/patches/server/0062-Make-arrow-movement-resetting-despawn-counter-config.patch b/patches/server/0063-Make-arrow-movement-resetting-despawn-counter-config.patch similarity index 88% rename from patches/server/0062-Make-arrow-movement-resetting-despawn-counter-config.patch rename to patches/server/0063-Make-arrow-movement-resetting-despawn-counter-config.patch index 6fd98ff..808b19a 100644 --- a/patches/server/0062-Make-arrow-movement-resetting-despawn-counter-config.patch +++ b/patches/server/0063-Make-arrow-movement-resetting-despawn-counter-config.patch @@ -30,15 +30,14 @@ index def3b3f8dac4b28eaaafdd9bc2e7f4b9ec9d6855..ca28f41a5a0405adf07cc2898d53a77f @Override diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 3b023cbd132c6aa263dbbe54ed7d30e1049d3875..345ce3a53e3e7ee5a4dd9a632231edfe161cd821 100644 +index 9470f4fcca253e722c4120fbab12da3959de60ab..201f30774536966bda6f79b4db2fba6352829e10 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -244,6 +244,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public GameplayMechanics gameplayMechanics; +@@ -245,6 +245,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { public class GameplayMechanics extends ConfigurationPart { + public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks + public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable -+ + public Fixes fixes; public class Fixes extends ConfigurationPart { - diff --git a/patches/server/0063-Reduce-array-allocations.patch b/patches/server/0064-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0063-Reduce-array-allocations.patch rename to patches/server/0064-Reduce-array-allocations.patch diff --git a/patches/server/0064-Optimize-sun-burn-tick.patch b/patches/server/0065-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0064-Optimize-sun-burn-tick.patch rename to patches/server/0065-Optimize-sun-burn-tick.patch diff --git a/patches/server/0065-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0066-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0065-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0066-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0066-Replace-AI-goal-set-with-optimized-collection.patch b/patches/server/0067-Replace-AI-goal-set-with-optimized-collection.patch similarity index 100% rename from patches/server/0066-Replace-AI-goal-set-with-optimized-collection.patch rename to patches/server/0067-Replace-AI-goal-set-with-optimized-collection.patch diff --git a/patches/server/0067-Replace-game-rules-map-with-optimized-collection.patch b/patches/server/0068-Replace-game-rules-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0067-Replace-game-rules-map-with-optimized-collection.patch rename to patches/server/0068-Replace-game-rules-map-with-optimized-collection.patch diff --git a/patches/server/0068-Replace-AI-attributes-with-optimized-collections.patch b/patches/server/0069-Replace-AI-attributes-with-optimized-collections.patch similarity index 100% rename from patches/server/0068-Replace-AI-attributes-with-optimized-collections.patch rename to patches/server/0069-Replace-AI-attributes-with-optimized-collections.patch diff --git a/patches/server/0069-Replace-class-map-with-optimized-collection.patch b/patches/server/0070-Replace-class-map-with-optimized-collection.patch similarity index 100% rename from patches/server/0069-Replace-class-map-with-optimized-collection.patch rename to patches/server/0070-Replace-class-map-with-optimized-collection.patch diff --git a/patches/server/0070-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0071-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0070-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0071-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0071-Cache-BlockStatePairKey-hash.patch b/patches/server/0072-Cache-BlockStatePairKey-hash.patch similarity index 100% rename from patches/server/0071-Cache-BlockStatePairKey-hash.patch rename to patches/server/0072-Cache-BlockStatePairKey-hash.patch diff --git a/patches/server/0072-Cache-CubeVoxelShape-shape-array.patch b/patches/server/0073-Cache-CubeVoxelShape-shape-array.patch similarity index 100% rename from patches/server/0072-Cache-CubeVoxelShape-shape-array.patch rename to patches/server/0073-Cache-CubeVoxelShape-shape-array.patch diff --git a/patches/server/0073-Replace-division-by-multiplication-in-CubePointRange.patch b/patches/server/0074-Replace-division-by-multiplication-in-CubePointRange.patch similarity index 100% rename from patches/server/0073-Replace-division-by-multiplication-in-CubePointRange.patch rename to patches/server/0074-Replace-division-by-multiplication-in-CubePointRange.patch diff --git a/patches/server/0074-Replace-parts-by-size-in-CubePointRange.patch b/patches/server/0075-Replace-parts-by-size-in-CubePointRange.patch similarity index 100% rename from patches/server/0074-Replace-parts-by-size-in-CubePointRange.patch rename to patches/server/0075-Replace-parts-by-size-in-CubePointRange.patch diff --git a/patches/server/0075-Check-frozen-ticks-before-landing-block.patch b/patches/server/0076-Check-frozen-ticks-before-landing-block.patch similarity index 100% rename from patches/server/0075-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0076-Check-frozen-ticks-before-landing-block.patch diff --git a/patches/server/0076-Faster-chunk-serialization.patch b/patches/server/0077-Faster-chunk-serialization.patch similarity index 100% rename from patches/server/0076-Faster-chunk-serialization.patch rename to patches/server/0077-Faster-chunk-serialization.patch diff --git a/patches/server/0077-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0078-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0077-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0078-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0078-Store-mob-counts-in-an-array.patch b/patches/server/0079-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0078-Store-mob-counts-in-an-array.patch rename to patches/server/0079-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0079-Optimize-noise-generation.patch b/patches/server/0080-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0079-Optimize-noise-generation.patch rename to patches/server/0080-Optimize-noise-generation.patch diff --git a/patches/server/0080-Ignore-durability-change-equipment-updates.patch b/patches/server/0081-Ignore-durability-change-equipment-updates.patch similarity index 96% rename from patches/server/0080-Ignore-durability-change-equipment-updates.patch rename to patches/server/0081-Ignore-durability-change-equipment-updates.patch index 04f7aad..ce21d89 100644 --- a/patches/server/0080-Ignore-durability-change-equipment-updates.patch +++ b/patches/server/0081-Ignore-durability-change-equipment-updates.patch @@ -25,7 +25,7 @@ index 05168f8b8f542e73e7296a0b3f892d35924394ba..093f8f7be0a6005321a45c42d70d0e8f if (this instanceof ServerPlayer && enumitemslot.getType() == EquipmentSlot.Type.ARMOR) { final org.bukkit.inventory.ItemStack oldItem = CraftItemStack.asBukkitCopy(itemstack); diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 345ce3a53e3e7ee5a4dd9a632231edfe161cd821..158897f2500ee9231c0661d015f55e5216b07554 100644 +index 201f30774536966bda6f79b4db2fba6352829e10..dcbda08a6246b21b370a9005ed095d4413be6a81 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -33,6 +33,8 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0081-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0082-Hide-flames-on-entities-with-fire-resistance.patch similarity index 88% rename from patches/server/0081-Hide-flames-on-entities-with-fire-resistance.patch rename to patches/server/0082-Hide-flames-on-entities-with-fire-resistance.patch index 89b2afe..0066800 100644 --- a/patches/server/0081-Hide-flames-on-entities-with-fire-resistance.patch +++ b/patches/server/0082-Hide-flames-on-entities-with-fire-resistance.patch @@ -30,12 +30,12 @@ index d6526c075bc82ae2d79e3e786bc469966f4cf92d..552198bd1a08d0967dba90104777105f 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 158897f2500ee9231c0661d015f55e5216b07554..4c499898191b2017508b9550e5f769f2d0c97c59 100644 +index dcbda08a6246b21b370a9005ed095d4413be6a81..3c8f498ed1f730cc53fd395839f58ac4bd916265 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -247,6 +247,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { - public class GameplayMechanics extends ConfigurationPart { +@@ -248,6 +248,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable + public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance diff --git a/patches/server/0082-Skip-cloning-advancement-criteria.patch b/patches/server/0083-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0082-Skip-cloning-advancement-criteria.patch rename to patches/server/0083-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0083-Player-canSee-by-entity-UUID.patch b/patches/server/0084-Player-canSee-by-entity-UUID.patch similarity index 100% rename from patches/server/0083-Player-canSee-by-entity-UUID.patch rename to patches/server/0084-Player-canSee-by-entity-UUID.patch diff --git a/patches/server/0084-Spread-out-sending-all-player-info.patch b/patches/server/0085-Spread-out-sending-all-player-info.patch similarity index 100% rename from patches/server/0084-Spread-out-sending-all-player-info.patch rename to patches/server/0085-Spread-out-sending-all-player-info.patch diff --git a/patches/server/0085-Optimize-player-list-for-sending-player-info.patch b/patches/server/0086-Optimize-player-list-for-sending-player-info.patch similarity index 100% rename from patches/server/0085-Optimize-player-list-for-sending-player-info.patch rename to patches/server/0086-Optimize-player-list-for-sending-player-info.patch diff --git a/patches/server/0086-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch b/patches/server/0087-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch similarity index 100% rename from patches/server/0086-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch rename to patches/server/0087-Skip-PlayerCommandSendEvent-if-there-are-no-listener.patch diff --git a/patches/server/0087-Send-multiple-keep-alive-packets.patch b/patches/server/0088-Send-multiple-keep-alive-packets.patch similarity index 100% rename from patches/server/0087-Send-multiple-keep-alive-packets.patch rename to patches/server/0088-Send-multiple-keep-alive-packets.patch diff --git a/patches/server/0088-Prevent-random-strolling-into-non-ticking-chunks.patch b/patches/server/0089-Prevent-entities-random-strolling-into-non-ticking-c.patch similarity index 75% rename from patches/server/0088-Prevent-random-strolling-into-non-ticking-chunks.patch rename to patches/server/0089-Prevent-entities-random-strolling-into-non-ticking-c.patch index c1ecad9..363b588 100644 --- a/patches/server/0088-Prevent-random-strolling-into-non-ticking-chunks.patch +++ b/patches/server/0089-Prevent-entities-random-strolling-into-non-ticking-c.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MartijnMuijsers Date: Wed, 30 Nov 2022 20:38:15 +0100 -Subject: [PATCH] Prevent random strolling into non-ticking chunks +Subject: [PATCH] Prevent entities random strolling into non-ticking chunks License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) @@ -12,7 +12,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper) Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java -index 216929c838446c3c14d9b9906ffa625ef35fcbc8..2c728037c561a834cb3ec485655c904d2e78430e 100644 +index 216929c838446c3c14d9b9906ffa625ef35fcbc8..29c7f53a4fa88a77c4076a6294e689e4dff9977b 100644 --- a/src/main/java/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java +++ b/src/main/java/net/minecraft/world/entity/ai/goal/RandomStrollGoal.java @@ -2,6 +2,9 @@ package net.minecraft.world.entity.ai.goal; @@ -30,19 +30,19 @@ index 216929c838446c3c14d9b9906ffa625ef35fcbc8..2c728037c561a834cb3ec485655c904d Vec3 vec3 = this.getPosition(); - if (vec3 == null) { -+ if (vec3 == null || (!this.mob.level.galeConfig().gameplayMechanics.entitiesCanRandomStrollIntoNonTickingChunks && !((ServerLevel) this.mob.level).isPositionEntityTicking(new BlockPos(vec3)))) { // Gale - MultiPaper - prevent random strolling into non-ticking chunks ++ if (vec3 == null || (!this.mob.level.galeConfig().gameplayMechanics.entitiesCanRandomStrollIntoNonTickingChunks && !((ServerLevel) this.mob.level).isPositionEntityTicking(new BlockPos(vec3)))) { // Gale - MultiPaper - prevent entities random strolling into non-ticking chunks return false; } 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 4c499898191b2017508b9550e5f769f2d0c97c59..9b4cebdfb75e1272417d207771807e9951badf70 100644 +index 3c8f498ed1f730cc53fd395839f58ac4bd916265..92c6883c86fcfae34a57feb15e3a401f2bddc36a 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -@@ -248,6 +248,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { +@@ -247,6 +247,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public class GameplayMechanics extends ConfigurationPart { + public boolean entitiesCanEatBlocksInNonTickingChunks = false; // Gale - Purpur - prevent entities eating blocks in non-ticking chunks ++ public boolean entitiesCanRandomStrollIntoNonTickingChunks = true; // Gale - MultiPaper - prevent entities random strolling into non-ticking chunks public boolean arrowMovementResetsDespawnCounter = true; // Gale - Purpur - make arrow movement resetting despawn counter configurable public boolean hideFlamesOnEntitiesWithFireResistance = false; // Gale - Slice - hide flames on entities with fire resistance -+ public boolean entitiesCanRandomStrollIntoNonTickingChunks = true; // Gale - MultiPaper - prevent random strolling into non-ticking chunks - public Fixes fixes; - public class Fixes extends ConfigurationPart { diff --git a/patches/server/0089-Specific-interval-TPS-API.patch b/patches/server/0090-Specific-interval-TPS-API.patch similarity index 100% rename from patches/server/0089-Specific-interval-TPS-API.patch rename to patches/server/0090-Specific-interval-TPS-API.patch diff --git a/patches/server/0090-5-second-TPS-average.patch b/patches/server/0091-5-second-TPS-average.patch similarity index 100% rename from patches/server/0090-5-second-TPS-average.patch rename to patches/server/0091-5-second-TPS-average.patch diff --git a/patches/server/0091-Measure-last-tick-time.patch b/patches/server/0092-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0091-Measure-last-tick-time.patch rename to patches/server/0092-Measure-last-tick-time.patch diff --git a/patches/server/0092-Last-tick-time-API.patch b/patches/server/0093-Last-tick-time-API.patch similarity index 100% rename from patches/server/0092-Last-tick-time-API.patch rename to patches/server/0093-Last-tick-time-API.patch diff --git a/patches/server/0093-Show-last-tick-time-in-tps-command.patch b/patches/server/0094-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0093-Show-last-tick-time-in-tps-command.patch rename to patches/server/0094-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0094-Increase-time-statistics-in-intervals.patch b/patches/server/0095-Increase-time-statistics-in-intervals.patch similarity index 100% rename from patches/server/0094-Increase-time-statistics-in-intervals.patch rename to patches/server/0095-Increase-time-statistics-in-intervals.patch diff --git a/patches/server/0095-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0096-For-collision-check-has-physics-before-same-vehicle.patch similarity index 100% rename from patches/server/0095-For-collision-check-has-physics-before-same-vehicle.patch rename to patches/server/0096-For-collision-check-has-physics-before-same-vehicle.patch diff --git a/patches/server/0096-Variable-main-thread-task-delay.patch b/patches/server/0097-Variable-main-thread-task-delay.patch similarity index 100% rename from patches/server/0096-Variable-main-thread-task-delay.patch rename to patches/server/0097-Variable-main-thread-task-delay.patch diff --git a/patches/server/0097-Reduce-RandomSource-instances.patch b/patches/server/0098-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0097-Reduce-RandomSource-instances.patch rename to patches/server/0098-Reduce-RandomSource-instances.patch diff --git a/patches/server/0098-CPU-cores-estimation.patch b/patches/server/0099-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0098-CPU-cores-estimation.patch rename to patches/server/0099-CPU-cores-estimation.patch diff --git a/patches/server/0099-Add-centralized-AsyncExecutor.patch b/patches/server/0100-Add-centralized-AsyncExecutor.patch similarity index 100% rename from patches/server/0099-Add-centralized-AsyncExecutor.patch rename to patches/server/0100-Add-centralized-AsyncExecutor.patch diff --git a/patches/server/0100-Remove-Paper-async-executor.patch b/patches/server/0101-Remove-Paper-async-executor.patch similarity index 100% rename from patches/server/0100-Remove-Paper-async-executor.patch rename to patches/server/0101-Remove-Paper-async-executor.patch diff --git a/patches/server/0101-Remove-Paper-cleaner-executor.patch b/patches/server/0102-Remove-Paper-cleaner-executor.patch similarity index 100% rename from patches/server/0101-Remove-Paper-cleaner-executor.patch rename to patches/server/0102-Remove-Paper-cleaner-executor.patch diff --git a/patches/server/0102-Remove-background-executor.patch b/patches/server/0103-Remove-background-executor.patch similarity index 100% rename from patches/server/0102-Remove-background-executor.patch rename to patches/server/0103-Remove-background-executor.patch diff --git a/patches/server/0103-Remove-bootstrap-executor.patch b/patches/server/0104-Remove-bootstrap-executor.patch similarity index 100% rename from patches/server/0103-Remove-bootstrap-executor.patch rename to patches/server/0104-Remove-bootstrap-executor.patch diff --git a/patches/server/0104-Remove-world-upgrade-executors.patch b/patches/server/0105-Remove-world-upgrade-executors.patch similarity index 100% rename from patches/server/0104-Remove-world-upgrade-executors.patch rename to patches/server/0105-Remove-world-upgrade-executors.patch diff --git a/patches/server/0105-Remove-tab-complete-executor.patch b/patches/server/0106-Remove-tab-complete-executor.patch similarity index 100% rename from patches/server/0105-Remove-tab-complete-executor.patch rename to patches/server/0106-Remove-tab-complete-executor.patch diff --git a/patches/server/0106-Remove-text-filter-executor.patch b/patches/server/0107-Remove-text-filter-executor.patch similarity index 100% rename from patches/server/0106-Remove-text-filter-executor.patch rename to patches/server/0107-Remove-text-filter-executor.patch