diff --git a/patches/server/0067-Cache-world-generator-sea-level.patch b/patches/removed/server/0067-Cache-world-generator-sea-level.patch similarity index 100% rename from patches/server/0067-Cache-world-generator-sea-level.patch rename to patches/removed/server/0067-Cache-world-generator-sea-level.patch diff --git a/patches/server/0006-Leaves-Server-Config-And-Command.patch b/patches/server/0006-Leaves-Server-Config-And-Command.patch index 5ff26a62..b0a292ee 100644 --- a/patches/server/0006-Leaves-Server-Config-And-Command.patch +++ b/patches/server/0006-Leaves-Server-Config-And-Command.patch @@ -85,10 +85,10 @@ index a41e6f5dc2d5516f081d7340e2dacffaf5663485..8f1230fcfa4fc27b513a4eb1023f107c .withRequiredArg() diff --git a/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/src/main/java/org/leavesmc/leaves/LeavesConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..a3b637eeb8022e1ad7d9dda945ea37651a0aa3fe +index 0000000000000000000000000000000000000000..c306d4827e645d47692746c12100f793c5b83973 --- /dev/null +++ b/src/main/java/org/leavesmc/leaves/LeavesConfig.java -@@ -0,0 +1,964 @@ +@@ -0,0 +1,962 @@ +package org.leavesmc.leaves; + +import com.destroystokyo.paper.util.SneakyThrow; @@ -676,9 +676,6 @@ index 0000000000000000000000000000000000000000..a3b637eeb8022e1ad7d9dda945ea3765 + @GlobalConfig("faster-chunk-serialization") + public boolean fasterChunkSerialization = true; + -+ @GlobalConfig("cache-world-generator-sea-level") -+ public boolean cacheWorldGeneratorSeaLevel = true; -+ + @GlobalConfig("skip-secondary-POI-sensor-if-absent") + public boolean skipSecondaryPOISensorIfAbsent = true; + @@ -709,6 +706,7 @@ index 0000000000000000000000000000000000000000..a3b637eeb8022e1ad7d9dda945ea3765 + @GlobalConfig("fix-villagers-dont-release-memory") + public boolean villagersDontReleaseMemoryFix = false; + ++ @RemovedConfig(name = "cache-world-generator-sea-level", category = "performance") + @RemovedConfig(name = "cache-ominous-banner-item", category = "performance") + @RemovedConfig(name = "use-optimized-collection", category = "performance") + @RemovedConfig(name = "async-pathfinding", category = "performance") diff --git a/patches/server/0068-Bladeren-Protocol.patch b/patches/server/0067-Bladeren-Protocol.patch similarity index 100% rename from patches/server/0068-Bladeren-Protocol.patch rename to patches/server/0067-Bladeren-Protocol.patch diff --git a/patches/server/0069-Skip-secondary-POI-sensor-if-absent.patch b/patches/server/0068-Skip-secondary-POI-sensor-if-absent.patch similarity index 100% rename from patches/server/0069-Skip-secondary-POI-sensor-if-absent.patch rename to patches/server/0068-Skip-secondary-POI-sensor-if-absent.patch diff --git a/patches/server/0070-Bladeren-mspt-sync-protocol.patch b/patches/server/0069-Bladeren-mspt-sync-protocol.patch similarity index 100% rename from patches/server/0070-Bladeren-mspt-sync-protocol.patch rename to patches/server/0069-Bladeren-mspt-sync-protocol.patch diff --git a/patches/server/0071-Store-mob-counts-in-an-array.patch b/patches/server/0070-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0071-Store-mob-counts-in-an-array.patch rename to patches/server/0070-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0072-Optimize-noise-generation.patch b/patches/server/0071-Optimize-noise-generation.patch similarity index 100% rename from patches/server/0072-Optimize-noise-generation.patch rename to patches/server/0071-Optimize-noise-generation.patch diff --git a/patches/server/0073-Disable-packet-limit.patch b/patches/server/0072-Disable-packet-limit.patch similarity index 100% rename from patches/server/0073-Disable-packet-limit.patch rename to patches/server/0072-Disable-packet-limit.patch diff --git a/patches/server/0074-Reduce-array-allocations.patch b/patches/server/0073-Reduce-array-allocations.patch similarity index 99% rename from patches/server/0074-Reduce-array-allocations.patch rename to patches/server/0073-Reduce-array-allocations.patch index 7bedb78a..8dada6f8 100644 --- a/patches/server/0074-Reduce-array-allocations.patch +++ b/patches/server/0073-Reduce-array-allocations.patch @@ -159,7 +159,7 @@ index 49e03ba7c04381e263aaee5cda9ed6c042bf6c0e..42e7da8be33fc4f85bf2d57b6f895762 public class Connection extends SimpleChannelInboundHandler> { diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index e52c490540319db13a2b23f839f7fd88aeadda64..a88ca4aaaca3c9e6370bba7e6fbdb0f57c6065f7 100644 +index cd6d1e625d5b22acf279be22da158d827686a922..f1a570b1eb25f2cbe83ce31a59ebfc26887add76 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -184,6 +184,7 @@ import org.bukkit.event.server.MapInitializeEvent; @@ -228,7 +228,7 @@ index 033755682c61c889723c3669b5cff4de147f637e..f4261a204577f349354b5ebca2d20702 final String s; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 7a80d3e7d46a9c2a729ca50e2bd265fe5711a23f..aa864ac20bb3d0ddef8376768bf5921e81eb9597 100644 +index 74fe50e7b95d3e993a6af18bdea3939ceaa40c0d..0d64e38f37f471de62d093de092ec5c0975f10ee 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -916,13 +916,9 @@ public abstract class PlayerList { diff --git a/patches/server/0075-Optimize-sun-burn-tick.patch b/patches/server/0074-Optimize-sun-burn-tick.patch similarity index 100% rename from patches/server/0075-Optimize-sun-burn-tick.patch rename to patches/server/0074-Optimize-sun-burn-tick.patch diff --git a/patches/server/0076-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0075-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0076-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0075-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0077-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/patches/server/0076-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch similarity index 100% rename from patches/server/0077-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch rename to patches/server/0076-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch diff --git a/patches/server/0078-Optimized-CubePointRange.patch b/patches/server/0077-Optimized-CubePointRange.patch similarity index 100% rename from patches/server/0078-Optimized-CubePointRange.patch rename to patches/server/0077-Optimized-CubePointRange.patch diff --git a/patches/server/0079-Check-frozen-ticks-before-landing-block.patch b/patches/server/0078-Check-frozen-ticks-before-landing-block.patch similarity index 93% rename from patches/server/0079-Check-frozen-ticks-before-landing-block.patch rename to patches/server/0078-Check-frozen-ticks-before-landing-block.patch index 00a0edeb..f33f88ac 100644 --- a/patches/server/0079-Check-frozen-ticks-before-landing-block.patch +++ b/patches/server/0078-Check-frozen-ticks-before-landing-block.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Check frozen ticks before landing block This patch is Powered by Gale(https://github.com/GaleMC/Gale) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 74e86f0e0fb237711c6741a1e3909e4f47dc200e..55cce94ebee920a64fdd80248fe10c231c8023d0 100644 +index 16cec435f86390ef57388ae83825dec397777b1c..b5a3606b0810290fbbd624a401977e24d5a6a178 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -581,11 +581,11 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0080-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0079-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from patches/server/0080-Skip-entity-move-if-movement-is-zero.patch rename to patches/server/0079-Skip-entity-move-if-movement-is-zero.patch diff --git a/patches/server/0081-Skip-cloning-advancement-criteria.patch b/patches/server/0080-Skip-cloning-advancement-criteria.patch similarity index 100% rename from patches/server/0081-Skip-cloning-advancement-criteria.patch rename to patches/server/0080-Skip-cloning-advancement-criteria.patch diff --git a/patches/server/0082-Fix-villagers-dont-release-memory.patch b/patches/server/0081-Fix-villagers-dont-release-memory.patch similarity index 100% rename from patches/server/0082-Fix-villagers-dont-release-memory.patch rename to patches/server/0081-Fix-villagers-dont-release-memory.patch diff --git a/patches/server/0083-Avoid-anvil-too-expensive.patch b/patches/server/0082-Avoid-anvil-too-expensive.patch similarity index 100% rename from patches/server/0083-Avoid-anvil-too-expensive.patch rename to patches/server/0082-Avoid-anvil-too-expensive.patch diff --git a/patches/server/0084-Bow-infinity-fix.patch b/patches/server/0083-Bow-infinity-fix.patch similarity index 100% rename from patches/server/0084-Bow-infinity-fix.patch rename to patches/server/0083-Bow-infinity-fix.patch diff --git a/patches/server/0085-Zero-tick-plants.patch b/patches/server/0084-Zero-tick-plants.patch similarity index 100% rename from patches/server/0085-Zero-tick-plants.patch rename to patches/server/0084-Zero-tick-plants.patch diff --git a/patches/server/0086-Leaves-Updater.patch b/patches/server/0085-Leaves-Updater.patch similarity index 100% rename from patches/server/0086-Leaves-Updater.patch rename to patches/server/0085-Leaves-Updater.patch diff --git a/patches/server/0087-Force-peaceful-mode-switch.patch b/patches/server/0086-Force-peaceful-mode-switch.patch similarity index 100% rename from patches/server/0087-Force-peaceful-mode-switch.patch rename to patches/server/0086-Force-peaceful-mode-switch.patch diff --git a/patches/server/0088-Replay-Mod-API.patch b/patches/server/0087-Replay-Mod-API.patch similarity index 100% rename from patches/server/0088-Replay-Mod-API.patch rename to patches/server/0087-Replay-Mod-API.patch diff --git a/patches/server/0089-Leaves-I18n.patch b/patches/server/0088-Leaves-I18n.patch similarity index 100% rename from patches/server/0089-Leaves-I18n.patch rename to patches/server/0088-Leaves-I18n.patch diff --git a/patches/server/0090-Fix-minecraft-hopper-not-work-without-player.patch b/patches/server/0089-Fix-minecraft-hopper-not-work-without-player.patch similarity index 100% rename from patches/server/0090-Fix-minecraft-hopper-not-work-without-player.patch rename to patches/server/0089-Fix-minecraft-hopper-not-work-without-player.patch diff --git a/patches/server/0091-RNG-Fishing.patch b/patches/server/0090-RNG-Fishing.patch similarity index 100% rename from patches/server/0091-RNG-Fishing.patch rename to patches/server/0090-RNG-Fishing.patch diff --git a/patches/server/0092-Wool-Hopper-Counter.patch b/patches/server/0091-Wool-Hopper-Counter.patch similarity index 100% rename from patches/server/0092-Wool-Hopper-Counter.patch rename to patches/server/0091-Wool-Hopper-Counter.patch diff --git a/patches/server/0093-Leaves-Reload-Command.patch b/patches/server/0092-Leaves-Reload-Command.patch similarity index 100% rename from patches/server/0093-Leaves-Reload-Command.patch rename to patches/server/0092-Leaves-Reload-Command.patch diff --git a/patches/server/0094-Spider-jockeys-drop-gapples.patch b/patches/server/0093-Spider-jockeys-drop-gapples.patch similarity index 100% rename from patches/server/0094-Spider-jockeys-drop-gapples.patch rename to patches/server/0093-Spider-jockeys-drop-gapples.patch diff --git a/patches/server/0095-Force-Void-Trade.patch b/patches/server/0094-Force-Void-Trade.patch similarity index 100% rename from patches/server/0095-Force-Void-Trade.patch rename to patches/server/0094-Force-Void-Trade.patch diff --git a/patches/server/0096-Villager-infinite-discounts.patch b/patches/server/0095-Villager-infinite-discounts.patch similarity index 100% rename from patches/server/0096-Villager-infinite-discounts.patch rename to patches/server/0095-Villager-infinite-discounts.patch diff --git a/patches/server/0097-CCE-update-suppression.patch b/patches/server/0096-CCE-update-suppression.patch similarity index 100% rename from patches/server/0097-CCE-update-suppression.patch rename to patches/server/0096-CCE-update-suppression.patch diff --git a/patches/server/0098-Disable-offline-warn-if-use-proxy.patch b/patches/server/0097-Disable-offline-warn-if-use-proxy.patch similarity index 93% rename from patches/server/0098-Disable-offline-warn-if-use-proxy.patch rename to patches/server/0097-Disable-offline-warn-if-use-proxy.patch index 4ca3ea1f..1fbd7853 100644 --- a/patches/server/0098-Disable-offline-warn-if-use-proxy.patch +++ b/patches/server/0097-Disable-offline-warn-if-use-proxy.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Disable offline warn if use proxy diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index e57aea5bc337e182f20ae2b90407f0ec15770bc1..beb0c55454e849de092cdf5cff5af73c178a6ed0 100644 +index f6c081b3362d9b84d16874e8af30e2f865b3ef7c..9c2c477d2d402675838520fe4c726fb8ea8a90af 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -301,7 +301,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface diff --git a/patches/server/0099-Armor-stand-cant-kill-by-mob-projectile.patch b/patches/server/0098-Armor-stand-cant-kill-by-mob-projectile.patch similarity index 100% rename from patches/server/0099-Armor-stand-cant-kill-by-mob-projectile.patch rename to patches/server/0098-Armor-stand-cant-kill-by-mob-projectile.patch diff --git a/patches/server/0100-Make-Item-tick-vanilla.patch b/patches/server/0099-Make-Item-tick-vanilla.patch similarity index 100% rename from patches/server/0100-Make-Item-tick-vanilla.patch rename to patches/server/0099-Make-Item-tick-vanilla.patch diff --git a/patches/server/0101-Copper-Bulb-1-gt-delay.patch b/patches/server/0100-Copper-Bulb-1-gt-delay.patch similarity index 100% rename from patches/server/0101-Copper-Bulb-1-gt-delay.patch rename to patches/server/0100-Copper-Bulb-1-gt-delay.patch diff --git a/patches/server/0102-Crafter-1-gt-delay.patch b/patches/server/0101-Crafter-1-gt-delay.patch similarity index 100% rename from patches/server/0102-Crafter-1-gt-delay.patch rename to patches/server/0101-Crafter-1-gt-delay.patch diff --git a/patches/server/0103-Linear-region-file-format.patch b/patches/server/0102-Linear-region-file-format.patch similarity index 100% rename from patches/server/0103-Linear-region-file-format.patch rename to patches/server/0102-Linear-region-file-format.patch diff --git a/patches/server/0104-No-TNT-place-update.patch b/patches/server/0103-No-TNT-place-update.patch similarity index 100% rename from patches/server/0104-No-TNT-place-update.patch rename to patches/server/0103-No-TNT-place-update.patch diff --git a/patches/server/0105-Servux-Protocol.patch b/patches/server/0104-Servux-Protocol.patch similarity index 100% rename from patches/server/0105-Servux-Protocol.patch rename to patches/server/0104-Servux-Protocol.patch diff --git a/patches/server/0106-Placing-locked-hopper-no-longer-send-NC-updates.patch b/patches/server/0105-Placing-locked-hopper-no-longer-send-NC-updates.patch similarity index 93% rename from patches/server/0106-Placing-locked-hopper-no-longer-send-NC-updates.patch rename to patches/server/0105-Placing-locked-hopper-no-longer-send-NC-updates.patch index c3e2847b..c9f07b69 100644 --- a/patches/server/0106-Placing-locked-hopper-no-longer-send-NC-updates.patch +++ b/patches/server/0105-Placing-locked-hopper-no-longer-send-NC-updates.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Placing locked hopper no longer send NC updates diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java -index 0df454c4e574aaf8b6d6e5210c399d452af26294..4dcf72b7cce6cf74326b1ffcc7d3648693bc58e8 100644 +index bb5a19253fdb46fabb0da2faa2a7d608fa79e279..56031f83d19fec3a48a44ddd3146c2d02a154cb7 100644 --- a/src/main/java/net/minecraft/world/level/Level.java +++ b/src/main/java/net/minecraft/world/level/Level.java @@ -1202,7 +1202,11 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl diff --git a/patches/server/0107-Renewable-deepslate.patch b/patches/server/0106-Renewable-deepslate.patch similarity index 100% rename from patches/server/0107-Renewable-deepslate.patch rename to patches/server/0106-Renewable-deepslate.patch diff --git a/patches/server/0108-Renewable-sponges.patch b/patches/server/0107-Renewable-sponges.patch similarity index 100% rename from patches/server/0108-Renewable-sponges.patch rename to patches/server/0107-Renewable-sponges.patch diff --git a/patches/server/0109-Renewable-coral.patch b/patches/server/0108-Renewable-coral.patch similarity index 100% rename from patches/server/0109-Renewable-coral.patch rename to patches/server/0108-Renewable-coral.patch diff --git a/patches/server/0110-Fast-resume.patch b/patches/server/0109-Fast-resume.patch similarity index 100% rename from patches/server/0110-Fast-resume.patch rename to patches/server/0109-Fast-resume.patch diff --git a/patches/server/0111-Vanilla-hopper.patch b/patches/server/0110-Vanilla-hopper.patch similarity index 100% rename from patches/server/0111-Vanilla-hopper.patch rename to patches/server/0110-Vanilla-hopper.patch diff --git a/patches/server/0112-Force-minecraft-command.patch b/patches/server/0111-Force-minecraft-command.patch similarity index 100% rename from patches/server/0112-Force-minecraft-command.patch rename to patches/server/0111-Force-minecraft-command.patch diff --git a/patches/server/0113-Fix-falling-block-s-block-location.patch b/patches/server/0112-Fix-falling-block-s-block-location.patch similarity index 100% rename from patches/server/0113-Fix-falling-block-s-block-location.patch rename to patches/server/0112-Fix-falling-block-s-block-location.patch diff --git a/patches/server/0114-Bytebuf-API.patch b/patches/server/0113-Bytebuf-API.patch similarity index 99% rename from patches/server/0114-Bytebuf-API.patch rename to patches/server/0113-Bytebuf-API.patch index b2e1671c..f556c894 100644 --- a/patches/server/0114-Bytebuf-API.patch +++ b/patches/server/0113-Bytebuf-API.patch @@ -18,7 +18,7 @@ index 5941800692ed06e17925ec6526ea38793a65de12..f77b2e12fb43039cf16a8511c9820859 } diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 0a88fb90b72e9f4bda6067cb42e024bb44b5101b..b39a6c5dd2cde112c5c5a317591f5ca51701a0a0 100644 +index 13dea31c8232cdb08aff09627e84711d2ef0aa6b..44371c123e4cdd2d5257cfeaaf3139b20e785769 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -471,6 +471,12 @@ public abstract class PlayerList { @@ -63,7 +63,7 @@ index ea4def367b645a442e7ee4fd8b1b2075b8604ccb..54d99e5b42082c306e0ac16b2b5ba9ff + // Leaves end - Bytebuf API } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 08de38dfc4b2f6f48e9f3ae1d303712ea619e21f..707c64ec946bafd78da5f070ec3af750ebc1d5e7 100644 +index d0132751fb057dc29e13ae3489beedb580225fa7..723db803297e06c053e160fd593dbed597eab82c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3580,4 +3580,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0115-Allow-grindstone-overstacking.patch b/patches/server/0114-Allow-grindstone-overstacking.patch similarity index 100% rename from patches/server/0115-Allow-grindstone-overstacking.patch rename to patches/server/0114-Allow-grindstone-overstacking.patch diff --git a/patches/server/0116-Configurable-MC-67.patch b/patches/server/0115-Configurable-MC-67.patch similarity index 100% rename from patches/server/0116-Configurable-MC-67.patch rename to patches/server/0115-Configurable-MC-67.patch diff --git a/patches/server/0117-Disable-end-gateway-portal-entity-ticking.patch b/patches/server/0116-Disable-end-gateway-portal-entity-ticking.patch similarity index 100% rename from patches/server/0117-Disable-end-gateway-portal-entity-ticking.patch rename to patches/server/0116-Disable-end-gateway-portal-entity-ticking.patch diff --git a/patches/server/0118-Disable-crystal-portal-proximity-check.patch b/patches/server/0117-Disable-crystal-portal-proximity-check.patch similarity index 100% rename from patches/server/0118-Disable-crystal-portal-proximity-check.patch rename to patches/server/0117-Disable-crystal-portal-proximity-check.patch diff --git a/patches/server/0119-Can-disable-LivingEntity-aiStep-alive-check.patch b/patches/server/0118-Can-disable-LivingEntity-aiStep-alive-check.patch similarity index 100% rename from patches/server/0119-Can-disable-LivingEntity-aiStep-alive-check.patch rename to patches/server/0118-Can-disable-LivingEntity-aiStep-alive-check.patch diff --git a/patches/server/0120-Leaves-plugins.patch b/patches/server/0119-Leaves-plugins.patch similarity index 100% rename from patches/server/0120-Leaves-plugins.patch rename to patches/server/0119-Leaves-plugins.patch diff --git a/patches/server/0121-Fix-fortress-mob-spawn.patch b/patches/server/0120-Fix-fortress-mob-spawn.patch similarity index 100% rename from patches/server/0121-Fix-fortress-mob-spawn.patch rename to patches/server/0120-Fix-fortress-mob-spawn.patch diff --git a/patches/server/0122-Fix-FallingBlockEntity-Duplicate.patch b/patches/server/0121-Fix-FallingBlockEntity-Duplicate.patch similarity index 100% rename from patches/server/0122-Fix-FallingBlockEntity-Duplicate.patch rename to patches/server/0121-Fix-FallingBlockEntity-Duplicate.patch diff --git a/patches/server/0123-Old-BlockEntity-behaviour.patch b/patches/server/0122-Old-BlockEntity-behaviour.patch similarity index 100% rename from patches/server/0123-Old-BlockEntity-behaviour.patch rename to patches/server/0122-Old-BlockEntity-behaviour.patch diff --git a/patches/server/0124-Revert-raid-changes.patch b/patches/server/0123-Revert-raid-changes.patch similarity index 100% rename from patches/server/0124-Revert-raid-changes.patch rename to patches/server/0123-Revert-raid-changes.patch diff --git a/patches/server/0125-Allow-anvil-destroy-item-entities.patch b/patches/server/0124-Allow-anvil-destroy-item-entities.patch similarity index 100% rename from patches/server/0125-Allow-anvil-destroy-item-entities.patch rename to patches/server/0124-Allow-anvil-destroy-item-entities.patch diff --git a/patches/server/0126-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch b/patches/server/0125-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch similarity index 96% rename from patches/server/0126-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch rename to patches/server/0125-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch index 1869476a..b7ae5158 100644 --- a/patches/server/0126-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch +++ b/patches/server/0125-Fix-Incorrect-Collision-Behavior-for-Block-Shape.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix Incorrect Collision Behavior for Block Shape diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java b/src/main/java/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java -index aec503ca1551ce4b15b8975832cd664ebd670722..7815fd1f7aa621351905555fa63479cce1798d99 100644 +index fb251665cdbafab90c6ff5e1bcb34fc17124d4d9..1d67244809da1b178448478e4b92727660af4a64 100644 --- a/src/main/java/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java +++ b/src/main/java/ca/spottedleaf/moonrise/patches/collisions/CollisionUtil.java @@ -101,6 +101,14 @@ public final class CollisionUtil { diff --git a/patches/server/0127-Disable-vault-blacklist.patch b/patches/server/0126-Disable-vault-blacklist.patch similarity index 100% rename from patches/server/0127-Disable-vault-blacklist.patch rename to patches/server/0126-Disable-vault-blacklist.patch diff --git a/patches/server/0128-TEMP-Fix-color-in-console.patch b/patches/server/0127-TEMP-Fix-color-in-console.patch similarity index 100% rename from patches/server/0128-TEMP-Fix-color-in-console.patch rename to patches/server/0127-TEMP-Fix-color-in-console.patch diff --git a/patches/server/0129-Fix-EntityPortalExitEvent-logic.patch b/patches/server/0128-Fix-EntityPortalExitEvent-logic.patch similarity index 100% rename from patches/server/0129-Fix-EntityPortalExitEvent-logic.patch rename to patches/server/0128-Fix-EntityPortalExitEvent-logic.patch diff --git a/patches/server/0130-Fix-CraftPortalEvent-logic.patch b/patches/server/0129-Fix-CraftPortalEvent-logic.patch similarity index 100% rename from patches/server/0130-Fix-CraftPortalEvent-logic.patch rename to patches/server/0129-Fix-CraftPortalEvent-logic.patch