diff --git a/patches/unapplied-server/0175-Add-portal-permission-bypass.patch b/patches/server/0168-Add-portal-permission-bypass.patch similarity index 54% rename from patches/unapplied-server/0175-Add-portal-permission-bypass.patch rename to patches/server/0168-Add-portal-permission-bypass.patch index 7d5cd2bd7..45e24d107 100644 --- a/patches/unapplied-server/0175-Add-portal-permission-bypass.patch +++ b/patches/server/0168-Add-portal-permission-bypass.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add portal permission bypass diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index ea3252a70c68f3c228417d8ed6d19d5669abb5fb..458c14d4f298137ef1a333368644568a2c8a0b09 100644 +index 68f414c421458a38e5db8225524c1bf87c2627f3..2fe3af832a228b1352b9b85dec06115009ef658f 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -197,6 +197,7 @@ public abstract class Player extends LivingEntity { +@@ -198,6 +198,7 @@ public abstract class Player extends LivingEntity { public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage public int sixRowEnderchestSlotCount = -1; // Purpur public int burpDelay = 0; // Purpur @@ -16,15 +16,19 @@ index ea3252a70c68f3c228417d8ed6d19d5669abb5fb..458c14d4f298137ef1a333368644568a // CraftBukkit start public boolean fauxSleeping; -@@ -488,7 +489,7 @@ public abstract class Player extends LivingEntity { - - @Override - public int getPortalWaitTime() { -- return Math.max(1, this.level().getGameRules().getInt(this.abilities.invulnerable ? GameRules.RULE_PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.RULE_PLAYERS_NETHER_PORTAL_DEFAULT_DELAY)); -+ return Math.max(1, canPortalInstant ? 1 : this.level().getGameRules().getInt(this.abilities.invulnerable ? GameRules.RULE_PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.RULE_PLAYERS_NETHER_PORTAL_DEFAULT_DELAY)); - } - +diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java +index 259f7e162968714e2959b199c7b1ab847dd624ef..901674b1d2e616beec4782258ffb923818513db6 100644 +--- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java +@@ -121,7 +121,7 @@ public class NetherPortalBlock extends Block implements Portal { @Override + public int getPortalTransitionTime(ServerLevel world, Entity entity) { + if (entity instanceof Player entityhuman) { +- return Math.max(1, world.getGameRules().getInt(entityhuman.getAbilities().invulnerable ? GameRules.RULE_PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.RULE_PLAYERS_NETHER_PORTAL_DEFAULT_DELAY)); ++ return Math.max(1, entityhuman.canPortalInstant ? 1 : world.getGameRules().getInt(entityhuman.getAbilities().invulnerable ? GameRules.RULE_PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.RULE_PLAYERS_NETHER_PORTAL_DEFAULT_DELAY)); // Purpur + } else { + return 0; + } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java index 41f3cdec7deabf34358b8087df77169f85a5b919..90265b6f2acd43713b61e277799dd31311b6b7e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java diff --git a/patches/server/0168-Shulker-spawn-from-bullet-options.patch b/patches/server/0169-Shulker-spawn-from-bullet-options.patch similarity index 100% rename from patches/server/0168-Shulker-spawn-from-bullet-options.patch rename to patches/server/0169-Shulker-spawn-from-bullet-options.patch diff --git a/patches/server/0169-Eating-glow-berries-adds-glow-effect.patch b/patches/server/0170-Eating-glow-berries-adds-glow-effect.patch similarity index 100% rename from patches/server/0169-Eating-glow-berries-adds-glow-effect.patch rename to patches/server/0170-Eating-glow-berries-adds-glow-effect.patch diff --git a/patches/server/0170-Option-to-make-drowned-break-doors.patch b/patches/server/0171-Option-to-make-drowned-break-doors.patch similarity index 100% rename from patches/server/0170-Option-to-make-drowned-break-doors.patch rename to patches/server/0171-Option-to-make-drowned-break-doors.patch diff --git a/patches/server/0171-Configurable-hunger-starvation-damage.patch b/patches/server/0172-Configurable-hunger-starvation-damage.patch similarity index 100% rename from patches/server/0171-Configurable-hunger-starvation-damage.patch rename to patches/server/0172-Configurable-hunger-starvation-damage.patch diff --git a/patches/server/0172-Enhance-SysoutCatcher.patch b/patches/server/0173-Enhance-SysoutCatcher.patch similarity index 100% rename from patches/server/0172-Enhance-SysoutCatcher.patch rename to patches/server/0173-Enhance-SysoutCatcher.patch diff --git a/patches/server/0173-Add-uptime-command.patch b/patches/server/0174-Add-uptime-command.patch similarity index 100% rename from patches/server/0173-Add-uptime-command.patch rename to patches/server/0174-Add-uptime-command.patch diff --git a/patches/server/0174-Tool-actionable-options.patch b/patches/server/0175-Tool-actionable-options.patch similarity index 100% rename from patches/server/0174-Tool-actionable-options.patch rename to patches/server/0175-Tool-actionable-options.patch diff --git a/patches/server/0175-Store-placer-on-Block-when-placed.patch b/patches/server/0176-Store-placer-on-Block-when-placed.patch similarity index 100% rename from patches/server/0175-Store-placer-on-Block-when-placed.patch rename to patches/server/0176-Store-placer-on-Block-when-placed.patch diff --git a/patches/server/0176-Summoner-API.patch b/patches/server/0177-Summoner-API.patch similarity index 100% rename from patches/server/0176-Summoner-API.patch rename to patches/server/0177-Summoner-API.patch diff --git a/patches/server/0177-Customizable-sleeping-actionbar-messages.patch b/patches/server/0178-Customizable-sleeping-actionbar-messages.patch similarity index 100% rename from patches/server/0177-Customizable-sleeping-actionbar-messages.patch rename to patches/server/0178-Customizable-sleeping-actionbar-messages.patch diff --git a/patches/server/0178-option-to-disable-shulker-box-items-from-dropping-co.patch b/patches/server/0179-option-to-disable-shulker-box-items-from-dropping-co.patch similarity index 100% rename from patches/server/0178-option-to-disable-shulker-box-items-from-dropping-co.patch rename to patches/server/0179-option-to-disable-shulker-box-items-from-dropping-co.patch diff --git a/patches/server/0179-Big-dripleaf-tilt-delay.patch b/patches/server/0180-Big-dripleaf-tilt-delay.patch similarity index 100% rename from patches/server/0179-Big-dripleaf-tilt-delay.patch rename to patches/server/0180-Big-dripleaf-tilt-delay.patch diff --git a/patches/server/0180-Player-ridable-in-water-option.patch b/patches/server/0181-Player-ridable-in-water-option.patch similarity index 93% rename from patches/server/0180-Player-ridable-in-water-option.patch rename to patches/server/0181-Player-ridable-in-water-option.patch index 13cbbad44..15783202e 100644 --- a/patches/server/0180-Player-ridable-in-water-option.patch +++ b/patches/server/0181-Player-ridable-in-water-option.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Player ridable in water option diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 68f414c421458a38e5db8225524c1bf87c2627f3..c610479c5c8d3e0aa5d70106eab8d8b1ccc80c7f 100644 +index 2fe3af832a228b1352b9b85dec06115009ef658f..cb6f161d32fe9642e9e9b1efc47d88612041ea15 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -2087,6 +2087,13 @@ public abstract class Player extends LivingEntity { +@@ -2088,6 +2088,13 @@ public abstract class Player extends LivingEntity { return slot != EquipmentSlot.BODY; } diff --git a/patches/server/0181-Config-to-disable-Enderman-teleport-on-projectile-hi.patch b/patches/server/0182-Config-to-disable-Enderman-teleport-on-projectile-hi.patch similarity index 100% rename from patches/server/0181-Config-to-disable-Enderman-teleport-on-projectile-hi.patch rename to patches/server/0182-Config-to-disable-Enderman-teleport-on-projectile-hi.patch diff --git a/patches/server/0182-Add-compass-command.patch b/patches/server/0183-Add-compass-command.patch similarity index 100% rename from patches/server/0182-Add-compass-command.patch rename to patches/server/0183-Add-compass-command.patch diff --git a/patches/server/0183-Toggle-for-kinetic-damage.patch b/patches/server/0184-Toggle-for-kinetic-damage.patch similarity index 100% rename from patches/server/0183-Toggle-for-kinetic-damage.patch rename to patches/server/0184-Toggle-for-kinetic-damage.patch diff --git a/patches/server/0184-Add-Option-for-disable-observer-clocks.patch b/patches/server/0185-Add-Option-for-disable-observer-clocks.patch similarity index 100% rename from patches/server/0184-Add-Option-for-disable-observer-clocks.patch rename to patches/server/0185-Add-Option-for-disable-observer-clocks.patch diff --git a/patches/server/0185-Customizeable-Zombie-Villager-curing-times.patch b/patches/server/0186-Customizeable-Zombie-Villager-curing-times.patch similarity index 100% rename from patches/server/0185-Customizeable-Zombie-Villager-curing-times.patch rename to patches/server/0186-Customizeable-Zombie-Villager-curing-times.patch diff --git a/patches/server/0186-Option-for-sponges-to-work-on-lava-and-mud.patch b/patches/server/0187-Option-for-sponges-to-work-on-lava-and-mud.patch similarity index 100% rename from patches/server/0186-Option-for-sponges-to-work-on-lava-and-mud.patch rename to patches/server/0187-Option-for-sponges-to-work-on-lava-and-mud.patch diff --git a/patches/server/0187-Toggle-for-Wither-s-spawn-sound.patch b/patches/server/0188-Toggle-for-Wither-s-spawn-sound.patch similarity index 100% rename from patches/server/0187-Toggle-for-Wither-s-spawn-sound.patch rename to patches/server/0188-Toggle-for-Wither-s-spawn-sound.patch diff --git a/patches/server/0188-Cactus-breaks-from-solid-neighbors-config.patch b/patches/server/0189-Cactus-breaks-from-solid-neighbors-config.patch similarity index 100% rename from patches/server/0188-Cactus-breaks-from-solid-neighbors-config.patch rename to patches/server/0189-Cactus-breaks-from-solid-neighbors-config.patch diff --git a/patches/server/0189-Conduit-behavior-configuration.patch b/patches/server/0190-Conduit-behavior-configuration.patch similarity index 100% rename from patches/server/0189-Conduit-behavior-configuration.patch rename to patches/server/0190-Conduit-behavior-configuration.patch diff --git a/patches/server/0190-Cauldron-fill-chances.patch b/patches/server/0191-Cauldron-fill-chances.patch similarity index 100% rename from patches/server/0190-Cauldron-fill-chances.patch rename to patches/server/0191-Cauldron-fill-chances.patch diff --git a/patches/server/0191-Config-to-allow-mobs-to-pathfind-over-rails.patch b/patches/server/0192-Config-to-allow-mobs-to-pathfind-over-rails.patch similarity index 100% rename from patches/server/0191-Config-to-allow-mobs-to-pathfind-over-rails.patch rename to patches/server/0192-Config-to-allow-mobs-to-pathfind-over-rails.patch diff --git a/patches/server/0192-Shulker-change-color-with-dye.patch b/patches/server/0193-Shulker-change-color-with-dye.patch similarity index 100% rename from patches/server/0192-Shulker-change-color-with-dye.patch rename to patches/server/0193-Shulker-change-color-with-dye.patch diff --git a/patches/server/0193-Extended-OfflinePlayer-API.patch b/patches/server/0194-Extended-OfflinePlayer-API.patch similarity index 100% rename from patches/server/0193-Extended-OfflinePlayer-API.patch rename to patches/server/0194-Extended-OfflinePlayer-API.patch diff --git a/patches/server/0194-Added-the-ability-to-add-combustible-items.patch b/patches/server/0195-Added-the-ability-to-add-combustible-items.patch similarity index 100% rename from patches/server/0194-Added-the-ability-to-add-combustible-items.patch rename to patches/server/0195-Added-the-ability-to-add-combustible-items.patch diff --git a/patches/server/0195-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch b/patches/server/0196-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch similarity index 100% rename from patches/server/0195-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch rename to patches/server/0196-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch diff --git a/patches/server/0196-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch b/patches/server/0197-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch similarity index 100% rename from patches/server/0196-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch rename to patches/server/0197-Chance-for-azalea-blocks-to-grow-into-trees-naturall.patch diff --git a/patches/server/0197-Shift-right-click-to-use-exp-for-mending.patch b/patches/server/0198-Shift-right-click-to-use-exp-for-mending.patch similarity index 100% rename from patches/server/0197-Shift-right-click-to-use-exp-for-mending.patch rename to patches/server/0198-Shift-right-click-to-use-exp-for-mending.patch diff --git a/patches/server/0198-Dolphins-naturally-aggressive-to-players-chance.patch b/patches/server/0199-Dolphins-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0198-Dolphins-naturally-aggressive-to-players-chance.patch rename to patches/server/0199-Dolphins-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0199-Cows-naturally-aggressive-to-players-chance.patch b/patches/server/0200-Cows-naturally-aggressive-to-players-chance.patch similarity index 100% rename from patches/server/0199-Cows-naturally-aggressive-to-players-chance.patch rename to patches/server/0200-Cows-naturally-aggressive-to-players-chance.patch diff --git a/patches/server/0200-Option-for-beds-to-explode-on-villager-sleep.patch b/patches/server/0201-Option-for-beds-to-explode-on-villager-sleep.patch similarity index 100% rename from patches/server/0200-Option-for-beds-to-explode-on-villager-sleep.patch rename to patches/server/0201-Option-for-beds-to-explode-on-villager-sleep.patch diff --git a/patches/server/0201-Halloween-options-and-optimizations.patch b/patches/server/0202-Halloween-options-and-optimizations.patch similarity index 100% rename from patches/server/0201-Halloween-options-and-optimizations.patch rename to patches/server/0202-Halloween-options-and-optimizations.patch diff --git a/patches/server/0202-Config-for-grindstones.patch b/patches/server/0203-Config-for-grindstones.patch similarity index 100% rename from patches/server/0202-Config-for-grindstones.patch rename to patches/server/0203-Config-for-grindstones.patch diff --git a/patches/server/0203-UPnP-Port-Forwarding.patch b/patches/server/0204-UPnP-Port-Forwarding.patch similarity index 100% rename from patches/server/0203-UPnP-Port-Forwarding.patch rename to patches/server/0204-UPnP-Port-Forwarding.patch diff --git a/patches/server/0204-Campfire-option-for-lit-when-placed.patch b/patches/server/0205-Campfire-option-for-lit-when-placed.patch similarity index 100% rename from patches/server/0204-Campfire-option-for-lit-when-placed.patch rename to patches/server/0205-Campfire-option-for-lit-when-placed.patch diff --git a/patches/server/0205-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0206-options-to-extinguish-fire-blocks-with-snowballs.patch similarity index 100% rename from patches/server/0205-options-to-extinguish-fire-blocks-with-snowballs.patch rename to patches/server/0206-options-to-extinguish-fire-blocks-with-snowballs.patch diff --git a/patches/server/0206-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0207-Add-option-to-disable-zombie-villagers-cure.patch similarity index 100% rename from patches/server/0206-Add-option-to-disable-zombie-villagers-cure.patch rename to patches/server/0207-Add-option-to-disable-zombie-villagers-cure.patch diff --git a/patches/server/0207-Persistent-BlockEntity-Lore-and-DisplayName.patch b/patches/server/0208-Persistent-BlockEntity-Lore-and-DisplayName.patch similarity index 100% rename from patches/server/0207-Persistent-BlockEntity-Lore-and-DisplayName.patch rename to patches/server/0208-Persistent-BlockEntity-Lore-and-DisplayName.patch diff --git a/patches/server/0208-Signs-allow-color-codes.patch b/patches/server/0209-Signs-allow-color-codes.patch similarity index 100% rename from patches/server/0208-Signs-allow-color-codes.patch rename to patches/server/0209-Signs-allow-color-codes.patch diff --git a/patches/server/0209-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch b/patches/server/0210-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch similarity index 100% rename from patches/server/0209-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch rename to patches/server/0210-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch diff --git a/patches/server/0210-Mobs-always-drop-experience.patch b/patches/server/0211-Mobs-always-drop-experience.patch similarity index 100% rename from patches/server/0210-Mobs-always-drop-experience.patch rename to patches/server/0211-Mobs-always-drop-experience.patch diff --git a/patches/server/0211-Grindstone-API.patch b/patches/server/0212-Grindstone-API.patch similarity index 100% rename from patches/server/0211-Grindstone-API.patch rename to patches/server/0212-Grindstone-API.patch diff --git a/patches/server/0212-Ability-for-hoe-to-replant-crops-and-nether-warts.patch b/patches/server/0213-Ability-for-hoe-to-replant-crops-and-nether-warts.patch similarity index 100% rename from patches/server/0212-Ability-for-hoe-to-replant-crops-and-nether-warts.patch rename to patches/server/0213-Ability-for-hoe-to-replant-crops-and-nether-warts.patch diff --git a/patches/server/0213-Turtle-eggs-random-tick-crack-chance.patch b/patches/server/0214-Turtle-eggs-random-tick-crack-chance.patch similarity index 100% rename from patches/server/0213-Turtle-eggs-random-tick-crack-chance.patch rename to patches/server/0214-Turtle-eggs-random-tick-crack-chance.patch diff --git a/patches/server/0214-Mob-head-visibility-percent.patch b/patches/server/0215-Mob-head-visibility-percent.patch similarity index 100% rename from patches/server/0214-Mob-head-visibility-percent.patch rename to patches/server/0215-Mob-head-visibility-percent.patch diff --git a/patches/server/0215-Configurable-valid-characters-for-usernames.patch b/patches/server/0216-Configurable-valid-characters-for-usernames.patch similarity index 100% rename from patches/server/0215-Configurable-valid-characters-for-usernames.patch rename to patches/server/0216-Configurable-valid-characters-for-usernames.patch diff --git a/patches/server/0216-Shears-can-have-looting-enchantment.patch b/patches/server/0217-Shears-can-have-looting-enchantment.patch similarity index 100% rename from patches/server/0216-Shears-can-have-looting-enchantment.patch rename to patches/server/0217-Shears-can-have-looting-enchantment.patch diff --git a/patches/server/0217-Stop-bees-from-dying-after-stinging.patch b/patches/server/0218-Stop-bees-from-dying-after-stinging.patch similarity index 100% rename from patches/server/0217-Stop-bees-from-dying-after-stinging.patch rename to patches/server/0218-Stop-bees-from-dying-after-stinging.patch diff --git a/patches/server/0218-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0219-Give-bee-counts-in-beehives-to-Purpur-clients.patch similarity index 100% rename from patches/server/0218-Give-bee-counts-in-beehives-to-Purpur-clients.patch rename to patches/server/0219-Give-bee-counts-in-beehives-to-Purpur-clients.patch diff --git a/patches/server/0219-Configurable-farmland-trample-height.patch b/patches/server/0220-Configurable-farmland-trample-height.patch similarity index 100% rename from patches/server/0219-Configurable-farmland-trample-height.patch rename to patches/server/0220-Configurable-farmland-trample-height.patch diff --git a/patches/server/0220-Configurable-player-pickup-exp-delay.patch b/patches/server/0221-Configurable-player-pickup-exp-delay.patch similarity index 96% rename from patches/server/0220-Configurable-player-pickup-exp-delay.patch rename to patches/server/0221-Configurable-player-pickup-exp-delay.patch index 34622f276..f32d85884 100644 --- a/patches/server/0220-Configurable-player-pickup-exp-delay.patch +++ b/patches/server/0221-Configurable-player-pickup-exp-delay.patch @@ -22,10 +22,10 @@ index 6598a737db11fb0c7e7a95b9bbfaabd75895cbdd..ad69ef7fb8e68027c6f41618ee258565 int i = this.repairPlayerItems(entityplayer, this.value); diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index c610479c5c8d3e0aa5d70106eab8d8b1ccc80c7f..d51e062ca2c432cf2976d5b2e03dcdcf8c40e348 100644 +index cb6f161d32fe9642e9e9b1efc47d88612041ea15..92df67d9e1d32c8a7aaeaaa46c7641af600edc52 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -635,7 +635,7 @@ public abstract class Player extends LivingEntity { +@@ -636,7 +636,7 @@ public abstract class Player extends LivingEntity { while (iterator.hasNext()) { Entity entity = (Entity) iterator.next(); diff --git a/patches/server/0221-Allow-void-trading.patch b/patches/server/0222-Allow-void-trading.patch similarity index 100% rename from patches/server/0221-Allow-void-trading.patch rename to patches/server/0222-Allow-void-trading.patch diff --git a/patches/server/0222-Configurable-phantom-size.patch b/patches/server/0223-Configurable-phantom-size.patch similarity index 100% rename from patches/server/0222-Configurable-phantom-size.patch rename to patches/server/0223-Configurable-phantom-size.patch diff --git a/patches/server/0223-Max-joins-per-second.patch b/patches/server/0224-Max-joins-per-second.patch similarity index 100% rename from patches/server/0223-Max-joins-per-second.patch rename to patches/server/0224-Max-joins-per-second.patch diff --git a/patches/server/0224-Configurable-minimum-demand-for-trades.patch b/patches/server/0225-Configurable-minimum-demand-for-trades.patch similarity index 100% rename from patches/server/0224-Configurable-minimum-demand-for-trades.patch rename to patches/server/0225-Configurable-minimum-demand-for-trades.patch diff --git a/patches/server/0225-Lobotomize-stuck-villagers.patch b/patches/server/0226-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/server/0225-Lobotomize-stuck-villagers.patch rename to patches/server/0226-Lobotomize-stuck-villagers.patch diff --git a/patches/server/0226-Option-for-villager-display-trade-item.patch b/patches/server/0227-Option-for-villager-display-trade-item.patch similarity index 100% rename from patches/server/0226-Option-for-villager-display-trade-item.patch rename to patches/server/0227-Option-for-villager-display-trade-item.patch diff --git a/patches/server/0227-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0228-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch similarity index 100% rename from patches/server/0227-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch rename to patches/server/0228-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch diff --git a/patches/server/0228-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0229-Config-for-mob-last-hurt-by-player-time.patch similarity index 100% rename from patches/server/0228-Config-for-mob-last-hurt-by-player-time.patch rename to patches/server/0229-Config-for-mob-last-hurt-by-player-time.patch diff --git a/patches/server/0229-Anvil-repair-damage-options.patch b/patches/server/0230-Anvil-repair-damage-options.patch similarity index 100% rename from patches/server/0229-Anvil-repair-damage-options.patch rename to patches/server/0230-Anvil-repair-damage-options.patch diff --git a/patches/server/0230-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0231-Option-to-disable-turtle-egg-trampling-with-feather-.patch similarity index 100% rename from patches/server/0230-Option-to-disable-turtle-egg-trampling-with-feather-.patch rename to patches/server/0231-Option-to-disable-turtle-egg-trampling-with-feather-.patch diff --git a/patches/server/0231-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0232-Add-toggle-for-enchant-level-clamping.patch similarity index 100% rename from patches/server/0231-Add-toggle-for-enchant-level-clamping.patch rename to patches/server/0232-Add-toggle-for-enchant-level-clamping.patch diff --git a/patches/server/0232-Skip-junit-tests-for-purpur-commands.patch b/patches/server/0233-Skip-junit-tests-for-purpur-commands.patch similarity index 100% rename from patches/server/0232-Skip-junit-tests-for-purpur-commands.patch rename to patches/server/0233-Skip-junit-tests-for-purpur-commands.patch diff --git a/patches/server/0233-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0234-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0233-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0234-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0234-Stonecutter-damage.patch b/patches/server/0235-Stonecutter-damage.patch similarity index 100% rename from patches/server/0234-Stonecutter-damage.patch rename to patches/server/0235-Stonecutter-damage.patch diff --git a/patches/server/0235-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0236-Configurable-damage-settings-for-magma-blocks.patch similarity index 100% rename from patches/server/0235-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0236-Configurable-damage-settings-for-magma-blocks.patch diff --git a/patches/server/0236-Add-config-for-snow-on-blue-ice.patch b/patches/server/0237-Add-config-for-snow-on-blue-ice.patch similarity index 100% rename from patches/server/0236-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0237-Add-config-for-snow-on-blue-ice.patch diff --git a/patches/server/0237-Skeletons-eat-wither-roses.patch b/patches/server/0238-Skeletons-eat-wither-roses.patch similarity index 100% rename from patches/server/0237-Skeletons-eat-wither-roses.patch rename to patches/server/0238-Skeletons-eat-wither-roses.patch diff --git a/patches/server/0238-Enchantment-Table-Persists-Lapis.patch b/patches/server/0239-Enchantment-Table-Persists-Lapis.patch similarity index 100% rename from patches/server/0238-Enchantment-Table-Persists-Lapis.patch rename to patches/server/0239-Enchantment-Table-Persists-Lapis.patch diff --git a/patches/server/0239-Spark-Profiler.patch b/patches/server/0240-Spark-Profiler.patch similarity index 100% rename from patches/server/0239-Spark-Profiler.patch rename to patches/server/0240-Spark-Profiler.patch diff --git a/patches/server/0240-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0241-Option-to-disable-kick-for-out-of-order-chat.patch similarity index 100% rename from patches/server/0240-Option-to-disable-kick-for-out-of-order-chat.patch rename to patches/server/0241-Option-to-disable-kick-for-out-of-order-chat.patch diff --git a/patches/server/0241-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0242-Config-for-sculk-shrieker-can_summon-state.patch similarity index 100% rename from patches/server/0241-Config-for-sculk-shrieker-can_summon-state.patch rename to patches/server/0242-Config-for-sculk-shrieker-can_summon-state.patch diff --git a/patches/server/0242-Config-to-not-let-coral-die.patch b/patches/server/0243-Config-to-not-let-coral-die.patch similarity index 100% rename from patches/server/0242-Config-to-not-let-coral-die.patch rename to patches/server/0243-Config-to-not-let-coral-die.patch diff --git a/patches/server/0243-Add-local-difficulty-api.patch b/patches/server/0244-Add-local-difficulty-api.patch similarity index 100% rename from patches/server/0243-Add-local-difficulty-api.patch rename to patches/server/0244-Add-local-difficulty-api.patch diff --git a/patches/server/0244-Add-toggle-for-RNG-manipulation.patch b/patches/server/0245-Add-toggle-for-RNG-manipulation.patch similarity index 100% rename from patches/server/0244-Add-toggle-for-RNG-manipulation.patch rename to patches/server/0245-Add-toggle-for-RNG-manipulation.patch diff --git a/patches/server/0245-Remove-Timings.patch b/patches/server/0246-Remove-Timings.patch similarity index 100% rename from patches/server/0245-Remove-Timings.patch rename to patches/server/0246-Remove-Timings.patch diff --git a/patches/server/0246-Remove-Mojang-Profiler.patch b/patches/server/0247-Remove-Mojang-Profiler.patch similarity index 100% rename from patches/server/0246-Remove-Mojang-Profiler.patch rename to patches/server/0247-Remove-Mojang-Profiler.patch diff --git a/patches/server/0247-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0248-Add-more-logger-output-for-invalid-movement-kicks.patch similarity index 100% rename from patches/server/0247-Add-more-logger-output-for-invalid-movement-kicks.patch rename to patches/server/0248-Add-more-logger-output-for-invalid-movement-kicks.patch diff --git a/patches/server/0248-Add-Bee-API.patch b/patches/server/0249-Add-Bee-API.patch similarity index 100% rename from patches/server/0248-Add-Bee-API.patch rename to patches/server/0249-Add-Bee-API.patch diff --git a/patches/server/0249-Debug-Marker-API.patch b/patches/server/0250-Debug-Marker-API.patch similarity index 100% rename from patches/server/0249-Debug-Marker-API.patch rename to patches/server/0250-Debug-Marker-API.patch diff --git a/patches/server/0250-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0251-mob-spawning-option-to-ignore-creative-players.patch similarity index 100% rename from patches/server/0250-mob-spawning-option-to-ignore-creative-players.patch rename to patches/server/0251-mob-spawning-option-to-ignore-creative-players.patch diff --git a/patches/server/0251-Add-skeleton-bow-accuracy-option.patch b/patches/server/0252-Add-skeleton-bow-accuracy-option.patch similarity index 100% rename from patches/server/0251-Add-skeleton-bow-accuracy-option.patch rename to patches/server/0252-Add-skeleton-bow-accuracy-option.patch diff --git a/patches/server/0252-Add-death-screen-API.patch b/patches/server/0253-Add-death-screen-API.patch similarity index 100% rename from patches/server/0252-Add-death-screen-API.patch rename to patches/server/0253-Add-death-screen-API.patch diff --git a/patches/server/0253-Implement-ram-and-rambar-commands.patch b/patches/server/0254-Implement-ram-and-rambar-commands.patch similarity index 100% rename from patches/server/0253-Implement-ram-and-rambar-commands.patch rename to patches/server/0254-Implement-ram-and-rambar-commands.patch diff --git a/patches/server/0254-Configurable-block-blast-resistance.patch b/patches/server/0255-Configurable-block-blast-resistance.patch similarity index 100% rename from patches/server/0254-Configurable-block-blast-resistance.patch rename to patches/server/0255-Configurable-block-blast-resistance.patch diff --git a/patches/server/0255-Configurable-block-fall-damage-modifiers.patch b/patches/server/0256-Configurable-block-fall-damage-modifiers.patch similarity index 100% rename from patches/server/0255-Configurable-block-fall-damage-modifiers.patch rename to patches/server/0256-Configurable-block-fall-damage-modifiers.patch diff --git a/patches/server/0256-Language-API.patch b/patches/server/0257-Language-API.patch similarity index 100% rename from patches/server/0256-Language-API.patch rename to patches/server/0257-Language-API.patch diff --git a/patches/server/0257-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0258-Milk-Keeps-Beneficial-Effects.patch similarity index 100% rename from patches/server/0257-Milk-Keeps-Beneficial-Effects.patch rename to patches/server/0258-Milk-Keeps-Beneficial-Effects.patch diff --git a/patches/server/0258-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0259-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch similarity index 100% rename from patches/server/0258-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch rename to patches/server/0259-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch diff --git a/patches/server/0259-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0260-Add-log-suppression-for-LibraryLoader.patch similarity index 100% rename from patches/server/0259-Add-log-suppression-for-LibraryLoader.patch rename to patches/server/0260-Add-log-suppression-for-LibraryLoader.patch diff --git a/patches/server/0260-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0261-Add-option-to-allow-creeper-to-encircle-target-when-.patch similarity index 100% rename from patches/server/0260-Add-option-to-allow-creeper-to-encircle-target-when-.patch rename to patches/server/0261-Add-option-to-allow-creeper-to-encircle-target-when-.patch diff --git a/patches/server/0261-Fire-Immunity-API.patch b/patches/server/0262-Fire-Immunity-API.patch similarity index 100% rename from patches/server/0261-Fire-Immunity-API.patch rename to patches/server/0262-Fire-Immunity-API.patch diff --git a/patches/server/0262-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0263-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch similarity index 100% rename from patches/server/0262-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch rename to patches/server/0263-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch diff --git a/patches/server/0263-Added-got-ram-event.patch b/patches/server/0264-Added-got-ram-event.patch similarity index 100% rename from patches/server/0263-Added-got-ram-event.patch rename to patches/server/0264-Added-got-ram-event.patch diff --git a/patches/server/0264-Log-skipped-entity-s-position.patch b/patches/server/0265-Log-skipped-entity-s-position.patch similarity index 100% rename from patches/server/0264-Log-skipped-entity-s-position.patch rename to patches/server/0265-Log-skipped-entity-s-position.patch diff --git a/patches/server/0265-End-Crystal-Cramming.patch b/patches/server/0266-End-Crystal-Cramming.patch similarity index 100% rename from patches/server/0265-End-Crystal-Cramming.patch rename to patches/server/0266-End-Crystal-Cramming.patch diff --git a/patches/server/0266-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0267-Option-to-allow-beacon-effects-when-covered-by-tinte.patch similarity index 100% rename from patches/server/0266-Option-to-allow-beacon-effects-when-covered-by-tinte.patch rename to patches/server/0267-Option-to-allow-beacon-effects-when-covered-by-tinte.patch diff --git a/patches/server/0267-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0268-Add-attribute-clamping-and-armor-limit-config.patch similarity index 100% rename from patches/server/0267-Add-attribute-clamping-and-armor-limit-config.patch rename to patches/server/0268-Add-attribute-clamping-and-armor-limit-config.patch diff --git a/patches/server/0268-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0269-Config-to-remove-explosion-radius-clamp.patch similarity index 100% rename from patches/server/0268-Config-to-remove-explosion-radius-clamp.patch rename to patches/server/0269-Config-to-remove-explosion-radius-clamp.patch diff --git a/patches/server/0269-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0270-bonemealable-sugarcane-cactus-and-netherwart.patch similarity index 100% rename from patches/server/0269-bonemealable-sugarcane-cactus-and-netherwart.patch rename to patches/server/0270-bonemealable-sugarcane-cactus-and-netherwart.patch diff --git a/patches/server/0270-Add-PreExplodeEvents.patch b/patches/server/0271-Add-PreExplodeEvents.patch similarity index 100% rename from patches/server/0270-Add-PreExplodeEvents.patch rename to patches/server/0271-Add-PreExplodeEvents.patch diff --git a/patches/server/0271-Improve-output-of-plugins-command.patch b/patches/server/0272-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/server/0271-Improve-output-of-plugins-command.patch rename to patches/server/0272-Improve-output-of-plugins-command.patch diff --git a/patches/server/0272-Make-GUI-Great-Again.patch b/patches/server/0273-Make-GUI-Great-Again.patch similarity index 100% rename from patches/server/0272-Make-GUI-Great-Again.patch rename to patches/server/0273-Make-GUI-Great-Again.patch diff --git a/patches/server/0273-Stored-Bee-API.patch b/patches/server/0274-Stored-Bee-API.patch similarity index 100% rename from patches/server/0273-Stored-Bee-API.patch rename to patches/server/0274-Stored-Bee-API.patch diff --git a/patches/server/0274-Shears-can-defuse-TNT.patch b/patches/server/0275-Shears-can-defuse-TNT.patch similarity index 100% rename from patches/server/0274-Shears-can-defuse-TNT.patch rename to patches/server/0275-Shears-can-defuse-TNT.patch diff --git a/patches/server/0275-Explorer-Map-API.patch b/patches/server/0276-Explorer-Map-API.patch similarity index 100% rename from patches/server/0275-Explorer-Map-API.patch rename to patches/server/0276-Explorer-Map-API.patch diff --git a/patches/server/0276-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0277-Option-Ocelot-Spawn-Under-Sea-Level.patch similarity index 100% rename from patches/server/0276-Option-Ocelot-Spawn-Under-Sea-Level.patch rename to patches/server/0277-Option-Ocelot-Spawn-Under-Sea-Level.patch diff --git a/patches/server/0277-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0278-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch similarity index 100% rename from patches/server/0277-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch rename to patches/server/0278-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch diff --git a/patches/server/0278-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0279-Add-option-for-always-showing-item-in-player-death-m.patch similarity index 100% rename from patches/server/0278-Add-option-for-always-showing-item-in-player-death-m.patch rename to patches/server/0279-Add-option-for-always-showing-item-in-player-death-m.patch diff --git a/patches/server/0279-place-end-crystal-on-any-block.patch b/patches/server/0280-place-end-crystal-on-any-block.patch similarity index 100% rename from patches/server/0279-place-end-crystal-on-any-block.patch rename to patches/server/0280-place-end-crystal-on-any-block.patch diff --git a/patches/server/0280-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0281-Add-option-to-disable-the-copper-oxidation-proximity.patch similarity index 100% rename from patches/server/0280-Add-option-to-disable-the-copper-oxidation-proximity.patch rename to patches/server/0281-Add-option-to-disable-the-copper-oxidation-proximity.patch diff --git a/patches/server/0281-register-minecraft-debug-commands.patch b/patches/server/0282-register-minecraft-debug-commands.patch similarity index 100% rename from patches/server/0281-register-minecraft-debug-commands.patch rename to patches/server/0282-register-minecraft-debug-commands.patch diff --git a/patches/server/0282-Configurable-villager-search-radius.patch b/patches/server/0283-Configurable-villager-search-radius.patch similarity index 100% rename from patches/server/0282-Configurable-villager-search-radius.patch rename to patches/server/0283-Configurable-villager-search-radius.patch diff --git a/patches/server/0283-option-to-make-ravagers-afraid-of-rabbits.patch b/patches/server/0284-option-to-make-ravagers-afraid-of-rabbits.patch similarity index 100% rename from patches/server/0283-option-to-make-ravagers-afraid-of-rabbits.patch rename to patches/server/0284-option-to-make-ravagers-afraid-of-rabbits.patch diff --git a/patches/server/0284-config-for-startup-commands.patch b/patches/server/0285-config-for-startup-commands.patch similarity index 100% rename from patches/server/0284-config-for-startup-commands.patch rename to patches/server/0285-config-for-startup-commands.patch diff --git a/patches/server/0285-Config-to-reverse-bubble-column-flow.patch b/patches/server/0286-Config-to-reverse-bubble-column-flow.patch similarity index 100% rename from patches/server/0285-Config-to-reverse-bubble-column-flow.patch rename to patches/server/0286-Config-to-reverse-bubble-column-flow.patch diff --git a/patches/server/0286-Adopt-MaterialRerouting.patch b/patches/server/0287-Adopt-MaterialRerouting.patch similarity index 100% rename from patches/server/0286-Adopt-MaterialRerouting.patch rename to patches/server/0287-Adopt-MaterialRerouting.patch