diff --git a/patches/unapplied-server/0211-Config-for-grindstones.patch b/patches/server/0210-Config-for-grindstones.patch similarity index 57% rename from patches/unapplied-server/0211-Config-for-grindstones.patch rename to patches/server/0210-Config-for-grindstones.patch index 79efc1f17..5b8243296 100644 --- a/patches/unapplied-server/0211-Config-for-grindstones.patch +++ b/patches/server/0210-Config-for-grindstones.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config for grindstones diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java -index db9444dda248260372d96ce239a590e88a4c1142..f7948de0180836f5bcf6818fe3a1362445a5befe 100644 +index db9444dda248260372d96ce239a590e88a4c1142..e9451ab9635b3040490a3cbbf0a2bdeb63fd3338 100644 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java @@ -130,7 +130,7 @@ public class GrindstoneMenu extends AbstractContainerMenu { @@ -26,7 +26,70 @@ index db9444dda248260372d96ce239a590e88a4c1142..f7948de0180836f5bcf6818fe3a13624 itemenchantments_a.upgrade(enchantment, entry.getIntValue()); } } -@@ -240,7 +240,7 @@ public class GrindstoneMenu extends AbstractContainerMenu { +@@ -237,10 +237,70 @@ public class GrindstoneMenu extends AbstractContainerMenu { + }); + } + ++ // Purpur start ++ private java.util.List> GRINDSTONE_REMOVE_ATTRIBUTES_REMOVAL_LIST = java.util.List.of( ++ // DataComponents.MAX_STACK_SIZE, ++ // DataComponents.DAMAGE, ++ // DataComponents.BLOCK_STATE, ++ DataComponents.CUSTOM_DATA, ++ // DataComponents.MAX_DAMAGE, ++ // DataComponents.UNBREAKABLE, ++ DataComponents.CUSTOM_NAME, ++ // DataComponents.ITEM_NAME, ++ DataComponents.LORE, ++ // DataComponents.RARITY, ++ DataComponents.ENCHANTMENTS, ++ // DataComponents.CAN_PLACE_ON, ++ // DataComponents.CAN_BREAK, ++ DataComponents.ATTRIBUTE_MODIFIERS, ++ DataComponents.CUSTOM_MODEL_DATA, ++ // DataComponents.HIDE_ADDITIONAL_TOOLTIP, ++ // DataComponents.HIDE_TOOLTIP, ++ // DataComponents.REPAIR_COST, ++ // DataComponents.CREATIVE_SLOT_LOCK, ++ // DataComponents.ENCHANTMENT_GLINT_OVERRIDE, ++ // DataComponents.INTANGIBLE_PROJECTILE, ++ // DataComponents.FOOD, ++ // DataComponents.FIRE_RESISTANT, ++ // DataComponents.TOOL, ++ // DataComponents.STORED_ENCHANTMENTS, ++ DataComponents.DYED_COLOR, ++ // DataComponents.MAP_COLOR, ++ // DataComponents.MAP_ID, ++ // DataComponents.MAP_DECORATIONS, ++ // DataComponents.MAP_POST_PROCESSING, ++ // DataComponents.CHARGED_PROJECTILES, ++ // DataComponents.BUNDLE_CONTENTS, ++ // DataComponents.POTION_CONTENTS, ++ DataComponents.SUSPICIOUS_STEW_EFFECTS ++ // DataComponents.WRITABLE_BOOK_CONTENT, ++ // DataComponents.WRITTEN_BOOK_CONTENT, ++ // DataComponents.TRIM, ++ // DataComponents.DEBUG_STICK_STATE, ++ // DataComponents.ENTITY_DATA, ++ // DataComponents.BUCKET_ENTITY_DATA, ++ // DataComponents.BLOCK_ENTITY_DATA, ++ // DataComponents.INSTRUMENT, ++ // DataComponents.OMINOUS_BOTTLE_AMPLIFIER, ++ // DataComponents.RECIPES, ++ // DataComponents.LODESTONE_TRACKER, ++ // DataComponents.FIREWORK_EXPLOSION, ++ // DataComponents.FIREWORKS, ++ // DataComponents.PROFILE, ++ // DataComponents.NOTE_BLOCK_SOUND, ++ // DataComponents.BANNER_PATTERNS, ++ // DataComponents.BASE_COLOR, ++ // DataComponents.POT_DECORATIONS, ++ // DataComponents.CONTAINER, ++ // DataComponents.BEES, ++ // DataComponents.LOCK, ++ // DataComponents.CONTAINER_LOOT, ++ ); ++ // Purpur end private ItemStack removeNonCursesFrom(ItemStack item) { ItemEnchantments itemenchantments = EnchantmentHelper.updateEnchantments(item, (itemenchantments_a) -> { itemenchantments_a.removeIf((holder) -> { @@ -35,23 +98,25 @@ index db9444dda248260372d96ce239a590e88a4c1142..f7948de0180836f5bcf6818fe3a13624 }); }); -@@ -255,6 +255,21 @@ public class GrindstoneMenu extends AbstractContainerMenu { +@@ -255,6 +315,23 @@ public class GrindstoneMenu extends AbstractContainerMenu { } item.set(DataComponents.REPAIR_COST, i); + + // Purpur start -+ if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveAttributes && itemstack1.getTag() != null) { -+ for (String key : itemstack1.getTag().getAllKeys()) { -+ if (!key.equals("display")) { -+ itemstack1.getTag().remove(key); ++ net.minecraft.core.component.DataComponentPatch.Builder builder = net.minecraft.core.component.DataComponentPatch.builder(); ++ if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveAttributes) { ++ item.getComponents().forEach(typedDataComponent -> { ++ if (GRINDSTONE_REMOVE_ATTRIBUTES_REMOVAL_LIST.contains(typedDataComponent.type())) { ++ builder.remove(typedDataComponent.type()); + } -+ } ++ }); + } -+ -+ if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveDisplay && itemstack1.getTag() != null) { -+ itemstack1.getTag().remove("display"); ++ if (org.purpurmc.purpur.PurpurConfig.grindstoneRemoveDisplay) { ++ builder.remove(DataComponents.CUSTOM_NAME); ++ builder.remove(DataComponents.LORE); + } ++ item.applyComponents(builder.build()); + // Purpur end + return item; diff --git a/patches/server/0210-UPnP-Port-Forwarding.patch b/patches/server/0211-UPnP-Port-Forwarding.patch similarity index 96% rename from patches/server/0210-UPnP-Port-Forwarding.patch rename to patches/server/0211-UPnP-Port-Forwarding.patch index 3563559b9..86b610183 100644 --- a/patches/server/0210-UPnP-Port-Forwarding.patch +++ b/patches/server/0211-UPnP-Port-Forwarding.patch @@ -67,10 +67,10 @@ index 8a132fcdeb620d2e7f1c0c8b9e592ff233cd0568..29af03b8690e4d402d1e4e4516e4dc73 // CraftBukkit start // this.setPlayerList(new DedicatedPlayerList(this, this.registries(), this.playerDataStorage)); // Spigot - moved up diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 042fd443c98258240042d3ce1650f36e601d72e3..e83b33f4e28a6f2310c807db011cae7f550c502c 100644 +index 6653162444df443ca990a25fc8b9f3c336841efb..64c62e4abefb7e95e881fa1d8918e43ae48eb1dd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -403,4 +403,9 @@ public class PurpurConfig { +@@ -419,4 +419,9 @@ public class PurpurConfig { private static void tpsCatchup() { tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup); } diff --git a/patches/server/0211-Campfire-option-for-lit-when-placed.patch b/patches/server/0212-Campfire-option-for-lit-when-placed.patch similarity index 100% rename from patches/server/0211-Campfire-option-for-lit-when-placed.patch rename to patches/server/0212-Campfire-option-for-lit-when-placed.patch diff --git a/patches/server/0212-options-to-extinguish-fire-blocks-with-snowballs.patch b/patches/server/0213-options-to-extinguish-fire-blocks-with-snowballs.patch similarity index 100% rename from patches/server/0212-options-to-extinguish-fire-blocks-with-snowballs.patch rename to patches/server/0213-options-to-extinguish-fire-blocks-with-snowballs.patch diff --git a/patches/server/0213-Add-option-to-disable-zombie-villagers-cure.patch b/patches/server/0214-Add-option-to-disable-zombie-villagers-cure.patch similarity index 100% rename from patches/server/0213-Add-option-to-disable-zombie-villagers-cure.patch rename to patches/server/0214-Add-option-to-disable-zombie-villagers-cure.patch diff --git a/patches/server/0214-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch b/patches/server/0215-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch similarity index 93% rename from patches/server/0214-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch rename to patches/server/0215-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch index 96cc718fe..e0c4575a3 100644 --- a/patches/server/0214-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch +++ b/patches/server/0215-Kelp-cave-weeping-and-twisting-vines-configurable-ma.patch @@ -135,13 +135,13 @@ index 3dec5a082606ee35a8c8d7f746480262d6a189c5..b2f6ccae9576c176263e51a232e17a08 + // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index e83b33f4e28a6f2310c807db011cae7f550c502c..ae0e335fb3f6d5e6f40de0f0fdac834d29cc0aa9 100644 +index 64c62e4abefb7e95e881fa1d8918e43ae48eb1dd..a1fa16fca204098fd2211a4c206299356fc97724 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -309,6 +309,10 @@ public class PurpurConfig { - public static int beeInsideBeeHive = 3; - public static boolean anvilCumulativeCost = true; - public static int lightningRodRange = 128; +@@ -312,6 +312,10 @@ public class PurpurConfig { + public static Set grindstoneIgnoredEnchants = new HashSet<>(); + public static boolean grindstoneRemoveAttributes = false; + public static boolean grindstoneRemoveDisplay = false; + public static int caveVinesMaxGrowthAge = 25; + public static int kelpMaxGrowthAge = 25; + public static int twistingVinesMaxGrowthAge = 25; @@ -149,10 +149,10 @@ index e83b33f4e28a6f2310c807db011cae7f550c502c..ae0e335fb3f6d5e6f40de0f0fdac834d private static void blockSettings() { if (version < 3) { boolean oldValue = getBoolean("settings.barrel.packed-barrels", true); -@@ -343,6 +347,30 @@ public class PurpurConfig { - beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive); - anvilCumulativeCost = getBoolean("settings.blocks.anvil.cumulative-cost", anvilCumulativeCost); - lightningRodRange = getInt("settings.blocks.lightning_rod.range", lightningRodRange); +@@ -359,6 +363,30 @@ public class PurpurConfig { + }); + grindstoneRemoveAttributes = getBoolean("settings.blocks.grindstone.remove-attributes", grindstoneRemoveAttributes); + grindstoneRemoveDisplay = getBoolean("settings.blocks.grindstone.remove-name-and-lore", grindstoneRemoveDisplay); + caveVinesMaxGrowthAge = getInt("settings.blocks.cave_vines.max-growth-age", caveVinesMaxGrowthAge); + if (caveVinesMaxGrowthAge > 25) { + caveVinesMaxGrowthAge = 25; diff --git a/patches/server/0215-Mobs-always-drop-experience.patch b/patches/server/0216-Mobs-always-drop-experience.patch similarity index 100% rename from patches/server/0215-Mobs-always-drop-experience.patch rename to patches/server/0216-Mobs-always-drop-experience.patch diff --git a/patches/server/0216-Grindstone-API.patch b/patches/server/0217-Grindstone-API.patch similarity index 92% rename from patches/server/0216-Grindstone-API.patch rename to patches/server/0217-Grindstone-API.patch index 330aa12fd..84897e687 100644 --- a/patches/server/0216-Grindstone-API.patch +++ b/patches/server/0217-Grindstone-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Grindstone API diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java -index db9444dda248260372d96ce239a590e88a4c1142..6d895008cd0654c9d6b7998ab985df8149a610b2 100644 +index e9451ab9635b3040490a3cbbf0a2bdeb63fd3338..4ab03c778bff9c23eafb36e97fadc0ee416e89f0 100644 --- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java +++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java @@ -95,9 +95,11 @@ public class GrindstoneMenu extends AbstractContainerMenu { @@ -21,7 +21,7 @@ index db9444dda248260372d96ce239a590e88a4c1142..6d895008cd0654c9d6b7998ab985df81 } world.levelEvent(1042, blockposition, 0); -@@ -316,7 +318,9 @@ public class GrindstoneMenu extends AbstractContainerMenu { +@@ -393,7 +395,9 @@ public class GrindstoneMenu extends AbstractContainerMenu { return ItemStack.EMPTY; } diff --git a/patches/server/0217-Ability-for-hoe-to-replant-crops-and-nether-warts.patch b/patches/server/0218-Ability-for-hoe-to-replant-crops-and-nether-warts.patch similarity index 100% rename from patches/server/0217-Ability-for-hoe-to-replant-crops-and-nether-warts.patch rename to patches/server/0218-Ability-for-hoe-to-replant-crops-and-nether-warts.patch diff --git a/patches/server/0218-Turtle-eggs-random-tick-crack-chance.patch b/patches/server/0219-Turtle-eggs-random-tick-crack-chance.patch similarity index 100% rename from patches/server/0218-Turtle-eggs-random-tick-crack-chance.patch rename to patches/server/0219-Turtle-eggs-random-tick-crack-chance.patch diff --git a/patches/server/0219-Mob-head-visibility-percent.patch b/patches/server/0220-Mob-head-visibility-percent.patch similarity index 100% rename from patches/server/0219-Mob-head-visibility-percent.patch rename to patches/server/0220-Mob-head-visibility-percent.patch diff --git a/patches/server/0220-Configurable-valid-characters-for-usernames.patch b/patches/server/0221-Configurable-valid-characters-for-usernames.patch similarity index 92% rename from patches/server/0220-Configurable-valid-characters-for-usernames.patch rename to patches/server/0221-Configurable-valid-characters-for-usernames.patch index 382006d31..a201a978b 100644 --- a/patches/server/0220-Configurable-valid-characters-for-usernames.patch +++ b/patches/server/0221-Configurable-valid-characters-for-usernames.patch @@ -17,10 +17,10 @@ index 0bd191acb9596d3aa21c337230d26f09d26f6888..20211f40aeeade9217ece087688974bd return false; } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index ae0e335fb3f6d5e6f40de0f0fdac834d29cc0aa9..9e4824e7cb7561a40cae7ccdcf49e01fd5118615 100644 +index a1fa16fca204098fd2211a4c206299356fc97724..107852247029b748a3e6e17b0ddbecdb50ce6d29 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -436,4 +436,11 @@ public class PurpurConfig { +@@ -452,4 +452,11 @@ public class PurpurConfig { private static void networkSettings() { useUPnP = getBoolean("settings.network.upnp-port-forwarding", useUPnP); } diff --git a/patches/server/0221-Shears-can-have-looting-enchantment.patch b/patches/server/0222-Shears-can-have-looting-enchantment.patch similarity index 98% rename from patches/server/0221-Shears-can-have-looting-enchantment.patch rename to patches/server/0222-Shears-can-have-looting-enchantment.patch index d8adfecdd..bd8ac1e24 100644 --- a/patches/server/0221-Shears-can-have-looting-enchantment.patch +++ b/patches/server/0222-Shears-can-have-looting-enchantment.patch @@ -139,10 +139,10 @@ index 754eb747179d9318bc5a3883e5622cc400c4e06c..4e929539cb093d58f3311d5f6a62bd1a this.generateShearedMushrooms(drops::add); return drops; diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 9e4824e7cb7561a40cae7ccdcf49e01fd5118615..a34c44ba770ded446b7969a31d3d05016717c13b 100644 +index 107852247029b748a3e6e17b0ddbecdb50ce6d29..19e54e22ca2e024074c28dda3bbdf75ce9f1b083 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -375,6 +375,7 @@ public class PurpurConfig { +@@ -391,6 +391,7 @@ public class PurpurConfig { public static boolean allowInfinityMending = false; public static boolean allowCrossbowInfinity = true; @@ -150,7 +150,7 @@ index 9e4824e7cb7561a40cae7ccdcf49e01fd5118615..a34c44ba770ded446b7969a31d3d0501 public static boolean allowUnsafeEnchants = false; public static boolean allowInapplicableEnchants = true; public static boolean allowIncompatibleEnchants = true; -@@ -397,6 +398,7 @@ public class PurpurConfig { +@@ -413,6 +414,7 @@ public class PurpurConfig { } allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending); allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity); diff --git a/patches/server/0222-Stop-bees-from-dying-after-stinging.patch b/patches/server/0223-Stop-bees-from-dying-after-stinging.patch similarity index 100% rename from patches/server/0222-Stop-bees-from-dying-after-stinging.patch rename to patches/server/0223-Stop-bees-from-dying-after-stinging.patch diff --git a/patches/server/0223-Give-bee-counts-in-beehives-to-Purpur-clients.patch b/patches/server/0224-Give-bee-counts-in-beehives-to-Purpur-clients.patch similarity index 98% rename from patches/server/0223-Give-bee-counts-in-beehives-to-Purpur-clients.patch rename to patches/server/0224-Give-bee-counts-in-beehives-to-Purpur-clients.patch index 527eeff3c..824c375e6 100644 --- a/patches/server/0223-Give-bee-counts-in-beehives-to-Purpur-clients.patch +++ b/patches/server/0224-Give-bee-counts-in-beehives-to-Purpur-clients.patch @@ -29,10 +29,10 @@ index 29af03b8690e4d402d1e4e4516e4dc731b7b4323..56c6800ae5696397ffba2dc2e0393019 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index a34c44ba770ded446b7969a31d3d05016717c13b..e50954e35116ea60b68ae00191771f8d9f78b45d 100644 +index 19e54e22ca2e024074c28dda3bbdf75ce9f1b083..2d32b5aaa2b2f33b773f9157aee4f7461c48147a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -418,6 +418,11 @@ public class PurpurConfig { +@@ -434,6 +434,11 @@ public class PurpurConfig { allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd); } diff --git a/patches/server/0224-Configurable-farmland-trample-height.patch b/patches/server/0225-Configurable-farmland-trample-height.patch similarity index 100% rename from patches/server/0224-Configurable-farmland-trample-height.patch rename to patches/server/0225-Configurable-farmland-trample-height.patch diff --git a/patches/server/0225-Configurable-player-pickup-exp-delay.patch b/patches/server/0226-Configurable-player-pickup-exp-delay.patch similarity index 97% rename from patches/server/0225-Configurable-player-pickup-exp-delay.patch rename to patches/server/0226-Configurable-player-pickup-exp-delay.patch index b09cede36..dbf7216d1 100644 --- a/patches/server/0225-Configurable-player-pickup-exp-delay.patch +++ b/patches/server/0226-Configurable-player-pickup-exp-delay.patch @@ -22,7 +22,7 @@ index 7ca70e9ddda24e2fe661c7b13fa439a6c19726dd..ce608784e0e35b67dde377436aaf42c9 int i = this.repairPlayerItems(player, 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 44ef706008a1477d2073c29f2c9d016bf91e15a6..102da46e66ac3a395af98fdb0013587ec6d7b48f 100644 +index 0460bdb52ce6b29cf57ef8f2d7f430e761c82d85..845c4af5d5d38d54de4a1b20fe32bf5dd4776a29 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java @@ -632,7 +632,7 @@ public abstract class Player extends LivingEntity { diff --git a/patches/server/0226-Allow-void-trading.patch b/patches/server/0227-Allow-void-trading.patch similarity index 100% rename from patches/server/0226-Allow-void-trading.patch rename to patches/server/0227-Allow-void-trading.patch diff --git a/patches/server/0227-Configurable-phantom-size.patch b/patches/server/0228-Configurable-phantom-size.patch similarity index 100% rename from patches/server/0227-Configurable-phantom-size.patch rename to patches/server/0228-Configurable-phantom-size.patch diff --git a/patches/server/0228-Max-joins-per-second.patch b/patches/server/0229-Max-joins-per-second.patch similarity index 94% rename from patches/server/0228-Max-joins-per-second.patch rename to patches/server/0229-Max-joins-per-second.patch index 614606510..46482bbe9 100644 --- a/patches/server/0228-Max-joins-per-second.patch +++ b/patches/server/0229-Max-joins-per-second.patch @@ -31,10 +31,10 @@ index 58d28b6c1cc7da7d786f78308db971f7502ad844..9f274048be29ed54dd91983447beadf0 } // Paper end - Buffer joins to world diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index e50954e35116ea60b68ae00191771f8d9f78b45d..64fc2ae0b1f086390614f03dc15aff4037d57d68 100644 +index 2d32b5aaa2b2f33b773f9157aee4f7461c48147a..42a916e89b838868967391b9c042ce5143d862d0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -440,8 +440,10 @@ public class PurpurConfig { +@@ -456,8 +456,10 @@ public class PurpurConfig { } public static boolean useUPnP = false; diff --git a/patches/server/0229-Configurable-minimum-demand-for-trades.patch b/patches/server/0230-Configurable-minimum-demand-for-trades.patch similarity index 100% rename from patches/server/0229-Configurable-minimum-demand-for-trades.patch rename to patches/server/0230-Configurable-minimum-demand-for-trades.patch diff --git a/patches/server/0230-Lobotomize-stuck-villagers.patch b/patches/server/0231-Lobotomize-stuck-villagers.patch similarity index 100% rename from patches/server/0230-Lobotomize-stuck-villagers.patch rename to patches/server/0231-Lobotomize-stuck-villagers.patch diff --git a/patches/server/0231-Option-for-villager-display-trade-item.patch b/patches/server/0232-Option-for-villager-display-trade-item.patch similarity index 100% rename from patches/server/0231-Option-for-villager-display-trade-item.patch rename to patches/server/0232-Option-for-villager-display-trade-item.patch diff --git a/patches/server/0232-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch b/patches/server/0233-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch similarity index 100% rename from patches/server/0232-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch rename to patches/server/0233-MC-238526-Fix-spawner-not-spawning-water-animals-cor.patch diff --git a/patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch b/patches/server/0234-Config-for-mob-last-hurt-by-player-time.patch similarity index 100% rename from patches/server/0233-Config-for-mob-last-hurt-by-player-time.patch rename to patches/server/0234-Config-for-mob-last-hurt-by-player-time.patch diff --git a/patches/server/0234-Anvil-repair-damage-options.patch b/patches/server/0235-Anvil-repair-damage-options.patch similarity index 100% rename from patches/server/0234-Anvil-repair-damage-options.patch rename to patches/server/0235-Anvil-repair-damage-options.patch diff --git a/patches/server/0235-Option-to-disable-turtle-egg-trampling-with-feather-.patch b/patches/server/0236-Option-to-disable-turtle-egg-trampling-with-feather-.patch similarity index 100% rename from patches/server/0235-Option-to-disable-turtle-egg-trampling-with-feather-.patch rename to patches/server/0236-Option-to-disable-turtle-egg-trampling-with-feather-.patch diff --git a/patches/server/0236-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0237-Add-toggle-for-enchant-level-clamping.patch similarity index 96% rename from patches/server/0236-Add-toggle-for-enchant-level-clamping.patch rename to patches/server/0237-Add-toggle-for-enchant-level-clamping.patch index 2d498458b..5e4013324 100644 --- a/patches/server/0236-Add-toggle-for-enchant-level-clamping.patch +++ b/patches/server/0237-Add-toggle-for-enchant-level-clamping.patch @@ -59,10 +59,10 @@ index af18de11dd55938b6091f5ab183bd3fe4e8df152..2c741860afa1fa4d5798c68b84ec3fe1 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 64fc2ae0b1f086390614f03dc15aff4037d57d68..1e28c96f5b142a28be530dfc24d67b99c3803948 100644 +index 42a916e89b838868967391b9c042ce5143d862d0..af79332c9c54ca314c59c6e503478e52c5970e31 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -382,6 +382,7 @@ public class PurpurConfig { +@@ -398,6 +398,7 @@ public class PurpurConfig { public static boolean allowHigherEnchantsLevels = true; public static boolean allowUnsafeEnchantCommand = false; public static boolean replaceIncompatibleEnchants = false; @@ -70,7 +70,7 @@ index 64fc2ae0b1f086390614f03dc15aff4037d57d68..1e28c96f5b142a28be530dfc24d67b99 private static void enchantmentSettings() { if (version < 5) { boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false); -@@ -405,6 +406,7 @@ public class PurpurConfig { +@@ -421,6 +422,7 @@ public class PurpurConfig { allowHigherEnchantsLevels = getBoolean("settings.enchantment.anvil.allow-higher-enchants-levels", allowHigherEnchantsLevels); allowUnsafeEnchantCommand = getBoolean("settings.enchantment.allow-unsafe-enchant-command", allowUnsafeEnchants); // allowUnsafeEnchants as default for backwards compatability replaceIncompatibleEnchants = getBoolean("settings.enchantment.anvil.replace-incompatible-enchants", replaceIncompatibleEnchants); diff --git a/patches/server/0237-Skip-junit-tests-for-purpur-commands.patch b/patches/server/0238-Skip-junit-tests-for-purpur-commands.patch similarity index 100% rename from patches/server/0237-Skip-junit-tests-for-purpur-commands.patch rename to patches/server/0238-Skip-junit-tests-for-purpur-commands.patch diff --git a/patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch b/patches/server/0239-Implement-configurable-search-radius-for-villagers-t.patch similarity index 100% rename from patches/server/0238-Implement-configurable-search-radius-for-villagers-t.patch rename to patches/server/0239-Implement-configurable-search-radius-for-villagers-t.patch diff --git a/patches/server/0239-Stonecutter-damage.patch b/patches/server/0240-Stonecutter-damage.patch similarity index 98% rename from patches/server/0239-Stonecutter-damage.patch rename to patches/server/0240-Stonecutter-damage.patch index 121a672c9..0e0adcbc4 100644 --- a/patches/server/0239-Stonecutter-damage.patch +++ b/patches/server/0240-Stonecutter-damage.patch @@ -128,7 +128,7 @@ index a49193a023bbd9b65bcd3652dc9c241720500755..6fed586c9a778f7a57e1b4ca2e6f2dbc } else if (source.is(DamageTypes.HOT_FLOOR)) { cause = DamageCause.HOT_FLOOR; diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 1e28c96f5b142a28be530dfc24d67b99c3803948..cadb07b2ec32baa5f509b9da3bfd9044cee19ba4 100644 +index af79332c9c54ca314c59c6e503478e52c5970e31..07d6455c781b8743a833cbc04576015433686c4b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -209,8 +209,10 @@ public class PurpurConfig { diff --git a/patches/server/0240-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0241-Configurable-damage-settings-for-magma-blocks.patch similarity index 100% rename from patches/server/0240-Configurable-damage-settings-for-magma-blocks.patch rename to patches/server/0241-Configurable-damage-settings-for-magma-blocks.patch diff --git a/patches/server/0241-Add-config-for-snow-on-blue-ice.patch b/patches/server/0242-Add-config-for-snow-on-blue-ice.patch similarity index 100% rename from patches/server/0241-Add-config-for-snow-on-blue-ice.patch rename to patches/server/0242-Add-config-for-snow-on-blue-ice.patch diff --git a/patches/server/0242-Skeletons-eat-wither-roses.patch b/patches/server/0243-Skeletons-eat-wither-roses.patch similarity index 100% rename from patches/server/0242-Skeletons-eat-wither-roses.patch rename to patches/server/0243-Skeletons-eat-wither-roses.patch diff --git a/patches/server/0243-Enchantment-Table-Persists-Lapis.patch b/patches/server/0244-Enchantment-Table-Persists-Lapis.patch similarity index 100% rename from patches/server/0243-Enchantment-Table-Persists-Lapis.patch rename to patches/server/0244-Enchantment-Table-Persists-Lapis.patch diff --git a/patches/server/0244-Spark-Profiler.patch b/patches/server/0245-Spark-Profiler.patch similarity index 100% rename from patches/server/0244-Spark-Profiler.patch rename to patches/server/0245-Spark-Profiler.patch diff --git a/patches/server/0245-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0246-Option-to-disable-kick-for-out-of-order-chat.patch similarity index 92% rename from patches/server/0245-Option-to-disable-kick-for-out-of-order-chat.patch rename to patches/server/0246-Option-to-disable-kick-for-out-of-order-chat.patch index 8064cbf52..aef122660 100644 --- a/patches/server/0245-Option-to-disable-kick-for-out-of-order-chat.patch +++ b/patches/server/0246-Option-to-disable-kick-for-out-of-order-chat.patch @@ -18,10 +18,10 @@ index 395ad65503c87250c0e2fa8112208f26fd3681be..7b28ec1c6d87bad32b46c6ac6cf9e97d voxelshape1 = (VoxelShape) iterator.next(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index cadb07b2ec32baa5f509b9da3bfd9044cee19ba4..801d269a038e68d428b31f12d372fd11ab552d50 100644 +index 07d6455c781b8743a833cbc04576015433686c4b..d038e62a0151e3b5c9dee06f1b2682684d0b496e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -445,9 +445,11 @@ public class PurpurConfig { +@@ -461,9 +461,11 @@ public class PurpurConfig { public static boolean useUPnP = false; public static boolean maxJoinsPerSecond = false; diff --git a/patches/server/0246-Config-for-sculk-shrieker-can_summon-state.patch b/patches/server/0247-Config-for-sculk-shrieker-can_summon-state.patch similarity index 100% rename from patches/server/0246-Config-for-sculk-shrieker-can_summon-state.patch rename to patches/server/0247-Config-for-sculk-shrieker-can_summon-state.patch diff --git a/patches/server/0247-Config-to-not-let-coral-die.patch b/patches/server/0248-Config-to-not-let-coral-die.patch similarity index 100% rename from patches/server/0247-Config-to-not-let-coral-die.patch rename to patches/server/0248-Config-to-not-let-coral-die.patch diff --git a/patches/server/0248-Add-local-difficulty-api.patch b/patches/server/0249-Add-local-difficulty-api.patch similarity index 100% rename from patches/server/0248-Add-local-difficulty-api.patch rename to patches/server/0249-Add-local-difficulty-api.patch diff --git a/patches/server/0249-Add-toggle-for-RNG-manipulation.patch b/patches/server/0250-Add-toggle-for-RNG-manipulation.patch similarity index 100% rename from patches/server/0249-Add-toggle-for-RNG-manipulation.patch rename to patches/server/0250-Add-toggle-for-RNG-manipulation.patch diff --git a/patches/server/0250-Remove-Timings.patch b/patches/server/0251-Remove-Timings.patch similarity index 100% rename from patches/server/0250-Remove-Timings.patch rename to patches/server/0251-Remove-Timings.patch diff --git a/patches/server/0251-Remove-Mojang-Profiler.patch b/patches/server/0252-Remove-Mojang-Profiler.patch similarity index 100% rename from patches/server/0251-Remove-Mojang-Profiler.patch rename to patches/server/0252-Remove-Mojang-Profiler.patch diff --git a/patches/server/0252-Add-more-logger-output-for-invalid-movement-kicks.patch b/patches/server/0253-Add-more-logger-output-for-invalid-movement-kicks.patch similarity index 100% rename from patches/server/0252-Add-more-logger-output-for-invalid-movement-kicks.patch rename to patches/server/0253-Add-more-logger-output-for-invalid-movement-kicks.patch diff --git a/patches/server/0253-Add-Bee-API.patch b/patches/server/0254-Add-Bee-API.patch similarity index 100% rename from patches/server/0253-Add-Bee-API.patch rename to patches/server/0254-Add-Bee-API.patch diff --git a/patches/server/0254-Debug-Marker-API.patch b/patches/server/0255-Debug-Marker-API.patch similarity index 100% rename from patches/server/0254-Debug-Marker-API.patch rename to patches/server/0255-Debug-Marker-API.patch diff --git a/patches/server/0255-mob-spawning-option-to-ignore-creative-players.patch b/patches/server/0256-mob-spawning-option-to-ignore-creative-players.patch similarity index 100% rename from patches/server/0255-mob-spawning-option-to-ignore-creative-players.patch rename to patches/server/0256-mob-spawning-option-to-ignore-creative-players.patch diff --git a/patches/server/0256-Add-skeleton-bow-accuracy-option.patch b/patches/server/0257-Add-skeleton-bow-accuracy-option.patch similarity index 100% rename from patches/server/0256-Add-skeleton-bow-accuracy-option.patch rename to patches/server/0257-Add-skeleton-bow-accuracy-option.patch diff --git a/patches/server/0257-Add-death-screen-API.patch b/patches/server/0258-Add-death-screen-API.patch similarity index 100% rename from patches/server/0257-Add-death-screen-API.patch rename to patches/server/0258-Add-death-screen-API.patch diff --git a/patches/server/0258-Implement-ram-and-rambar-commands.patch b/patches/server/0259-Implement-ram-and-rambar-commands.patch similarity index 99% rename from patches/server/0258-Implement-ram-and-rambar-commands.patch rename to patches/server/0259-Implement-ram-and-rambar-commands.patch index 6ac14937f..63ca55dde 100644 --- a/patches/server/0258-Implement-ram-and-rambar-commands.patch +++ b/patches/server/0259-Implement-ram-and-rambar-commands.patch @@ -60,7 +60,7 @@ index 826b7e2bb897609a084555632f691ddb38882058..42a623254bd2886d09eb0cfeb01dd12d // Purpur end } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 801d269a038e68d428b31f12d372fd11ab552d50..b2e88e4b9b8afbb9ea6d14c6e268ac53b96b41bd 100644 +index d038e62a0151e3b5c9dee06f1b2682684d0b496e..b94f7b882405345f6154383beaef8d89673726c9 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -182,6 +182,8 @@ public class PurpurConfig { diff --git a/patches/server/0259-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0260-Add-an-option-to-fix-MC-3304-projectile-looting.patch similarity index 97% rename from patches/server/0259-Add-an-option-to-fix-MC-3304-projectile-looting.patch rename to patches/server/0260-Add-an-option-to-fix-MC-3304-projectile-looting.patch index c0c0b9b78..2f4116d77 100644 --- a/patches/server/0259-Add-an-option-to-fix-MC-3304-projectile-looting.patch +++ b/patches/server/0260-Add-an-option-to-fix-MC-3304-projectile-looting.patch @@ -86,10 +86,10 @@ index cfe953bc924f46b570e37395ac0f05ebcb82eb39..5500e7ada2dd783cc1317968a3e54696 if (context.hasParam(LootContextParams.LOOTING_MOD)) { i = context.getParamOrNull(LootContextParams.LOOTING_MOD); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index b2e88e4b9b8afbb9ea6d14c6e268ac53b96b41bd..67fe92fdb068ce3cb45317d250dfeeb30475beb4 100644 +index b94f7b882405345f6154383beaef8d89673726c9..9cda9416f015356a57c28fa5e4f62987f72c15f1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -481,4 +481,9 @@ public class PurpurConfig { +@@ -497,4 +497,9 @@ public class PurpurConfig { String setPattern = getString("settings.username-valid-characters", defaultPattern); usernameValidCharactersPattern = java.util.regex.Pattern.compile(setPattern == null || setPattern.isBlank() ? defaultPattern : setPattern); } diff --git a/patches/server/0260-Configurable-block-blast-resistance.patch b/patches/server/0261-Configurable-block-blast-resistance.patch similarity index 94% rename from patches/server/0260-Configurable-block-blast-resistance.patch rename to patches/server/0261-Configurable-block-blast-resistance.patch index 045b703bc..5067e60fa 100644 --- a/patches/server/0260-Configurable-block-blast-resistance.patch +++ b/patches/server/0261-Configurable-block-blast-resistance.patch @@ -18,10 +18,10 @@ index 3c1091f2a729b7d06ba6e21c37f788edb2ad1775..031fc626d2075cbe0941fecc18840671 protected final SoundType soundType; protected final float friction; diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 67fe92fdb068ce3cb45317d250dfeeb30475beb4..c218b0d4cfce46c5c2f042566d618bf36ee5e1b4 100644 +index 9cda9416f015356a57c28fa5e4f62987f72c15f1..bddf643f229d2a62746d89133e7013f1a3fafb45 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -486,4 +486,19 @@ public class PurpurConfig { +@@ -502,4 +502,19 @@ public class PurpurConfig { private static void fixProjectileLootingTransfer() { fixProjectileLootingTransfer = getBoolean("settings.fix-projectile-looting-transfer", fixProjectileLootingTransfer); } diff --git a/patches/server/0261-Configurable-block-fall-damage-modifiers.patch b/patches/server/0262-Configurable-block-fall-damage-modifiers.patch similarity index 97% rename from patches/server/0261-Configurable-block-fall-damage-modifiers.patch rename to patches/server/0262-Configurable-block-fall-damage-modifiers.patch index de16399e5..489e026c7 100644 --- a/patches/server/0261-Configurable-block-fall-damage-modifiers.patch +++ b/patches/server/0262-Configurable-block-fall-damage-modifiers.patch @@ -54,10 +54,10 @@ index ef364aa171a48482a45bc18cfe730ec20c3f7be6..74971d90506aa253d5ee821b5390fb25 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index c218b0d4cfce46c5c2f042566d618bf36ee5e1b4..1e66458fc3d91426109d920e8d73d157e91dfed5 100644 +index bddf643f229d2a62746d89133e7013f1a3fafb45..05c90e15cd487335840c7841874ebb99c576e1cc 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -501,4 +501,50 @@ public class PurpurConfig { +@@ -517,4 +517,50 @@ public class PurpurConfig { block.explosionResistance = blastResistance.floatValue(); }); } diff --git a/patches/server/0262-Language-API.patch b/patches/server/0263-Language-API.patch similarity index 100% rename from patches/server/0262-Language-API.patch rename to patches/server/0263-Language-API.patch diff --git a/patches/server/0263-Milk-Keeps-Beneficial-Effects.patch b/patches/server/0264-Milk-Keeps-Beneficial-Effects.patch similarity index 100% rename from patches/server/0263-Milk-Keeps-Beneficial-Effects.patch rename to patches/server/0264-Milk-Keeps-Beneficial-Effects.patch diff --git a/patches/server/0264-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch b/patches/server/0265-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch similarity index 100% rename from patches/server/0264-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch rename to patches/server/0265-MC-121706-Fix-mobs-not-looking-up-and-down-when-stra.patch diff --git a/patches/server/0265-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0266-Add-log-suppression-for-LibraryLoader.patch similarity index 91% rename from patches/server/0265-Add-log-suppression-for-LibraryLoader.patch rename to patches/server/0266-Add-log-suppression-for-LibraryLoader.patch index 8cba1853a..aa5f01e9a 100644 --- a/patches/server/0265-Add-log-suppression-for-LibraryLoader.patch +++ b/patches/server/0266-Add-log-suppression-for-LibraryLoader.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add log suppression for LibraryLoader diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 1e66458fc3d91426109d920e8d73d157e91dfed5..6baa4b8a2ab5529e6867de7a9113e020d016aff6 100644 +index 05c90e15cd487335840c7841874ebb99c576e1cc..33011a76cf02d7fa2860432ad13a8666e6094b4a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -454,11 +454,14 @@ public class PurpurConfig { +@@ -470,11 +470,14 @@ public class PurpurConfig { public static boolean loggerSuppressIgnoredAdvancementWarnings = false; public static boolean loggerSuppressUnrecognizedRecipeErrors = false; public static boolean loggerSuppressSetBlockFarChunk = false; diff --git a/patches/server/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch b/patches/server/0267-Add-option-to-allow-creeper-to-encircle-target-when-.patch similarity index 100% rename from patches/server/0266-Add-option-to-allow-creeper-to-encircle-target-when-.patch rename to patches/server/0267-Add-option-to-allow-creeper-to-encircle-target-when-.patch diff --git a/patches/server/0267-Fire-Immunity-API.patch b/patches/server/0268-Fire-Immunity-API.patch similarity index 100% rename from patches/server/0267-Fire-Immunity-API.patch rename to patches/server/0268-Fire-Immunity-API.patch diff --git a/patches/server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch b/patches/server/0269-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch similarity index 100% rename from patches/server/0268-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch rename to patches/server/0269-Add-option-to-teleport-to-spawn-on-nether-ceiling-da.patch diff --git a/patches/server/0269-Added-got-ram-event.patch b/patches/server/0270-Added-got-ram-event.patch similarity index 100% rename from patches/server/0269-Added-got-ram-event.patch rename to patches/server/0270-Added-got-ram-event.patch diff --git a/patches/server/0270-Log-skipped-entity-s-position.patch b/patches/server/0271-Log-skipped-entity-s-position.patch similarity index 100% rename from patches/server/0270-Log-skipped-entity-s-position.patch rename to patches/server/0271-Log-skipped-entity-s-position.patch diff --git a/patches/server/0271-End-Crystal-Cramming.patch b/patches/server/0272-End-Crystal-Cramming.patch similarity index 100% rename from patches/server/0271-End-Crystal-Cramming.patch rename to patches/server/0272-End-Crystal-Cramming.patch diff --git a/patches/server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch b/patches/server/0273-Option-to-allow-beacon-effects-when-covered-by-tinte.patch similarity index 97% rename from patches/server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch rename to patches/server/0273-Option-to-allow-beacon-effects-when-covered-by-tinte.patch index 6770c73c8..b7c21f3d7 100644 --- a/patches/server/0272-Option-to-allow-beacon-effects-when-covered-by-tinte.patch +++ b/patches/server/0273-Option-to-allow-beacon-effects-when-covered-by-tinte.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Option to allow beacon effects when covered by tinted glass diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java -index 37ce2605c8803d8d87770bf6a95a83aa975b99fe..39d4e47b1408dd7c0174a6cf8b4ebac63d590a53 100644 +index 2b9cc89a2e71b523c90bbfa987b0f8352efff95a..5ad48d2003fbd83e60f6faa68532496131935828 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/BeaconBlockEntity.java @@ -178,6 +178,7 @@ public class BeaconBlockEntity extends BlockEntity implements MenuProvider, Name diff --git a/patches/server/0273-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0274-Add-attribute-clamping-and-armor-limit-config.patch similarity index 95% rename from patches/server/0273-Add-attribute-clamping-and-armor-limit-config.patch rename to patches/server/0274-Add-attribute-clamping-and-armor-limit-config.patch index 414bc9582..a3570be64 100644 --- a/patches/server/0273-Add-attribute-clamping-and-armor-limit-config.patch +++ b/patches/server/0274-Add-attribute-clamping-and-armor-limit-config.patch @@ -39,10 +39,10 @@ index f0703302e7dbbda88de8c648d20d87c55ed9b1e0..a913ebabaa5f443afa987b972355a8f8 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 6baa4b8a2ab5529e6867de7a9113e020d016aff6..cf2c0642fc09b6f806903a684ccc215b0ad6276f 100644 +index 33011a76cf02d7fa2860432ad13a8666e6094b4a..7f57982ffdd3e571937e9f4a2fa4ac0ea88373f8 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -490,6 +490,16 @@ public class PurpurConfig { +@@ -506,6 +506,16 @@ public class PurpurConfig { fixProjectileLootingTransfer = getBoolean("settings.fix-projectile-looting-transfer", fixProjectileLootingTransfer); } diff --git a/patches/server/0274-Config-to-remove-explosion-radius-clamp.patch b/patches/server/0275-Config-to-remove-explosion-radius-clamp.patch similarity index 95% rename from patches/server/0274-Config-to-remove-explosion-radius-clamp.patch rename to patches/server/0275-Config-to-remove-explosion-radius-clamp.patch index 8dc99e2b4..574d2b886 100644 --- a/patches/server/0274-Config-to-remove-explosion-radius-clamp.patch +++ b/patches/server/0275-Config-to-remove-explosion-radius-clamp.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Config to remove explosion radius clamp diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java -index 6b6340ae8ca3f81f08f9038b63ebc419e003cf6b..ed31528ddfec06e723827a505daeca5938dba865 100644 +index 6379b3b8e633d1a16532b4664e53fa5afa616ab6..69d8ff6a97335b6fe4b20a8229a77f2591b0f050 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -98,7 +98,7 @@ public class Explosion { diff --git a/patches/server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch b/patches/server/0276-bonemealable-sugarcane-cactus-and-netherwart.patch similarity index 100% rename from patches/server/0275-bonemealable-sugarcane-cactus-and-netherwart.patch rename to patches/server/0276-bonemealable-sugarcane-cactus-and-netherwart.patch diff --git a/patches/server/0276-Add-PreExplodeEvents.patch b/patches/server/0277-Add-PreExplodeEvents.patch similarity index 100% rename from patches/server/0276-Add-PreExplodeEvents.patch rename to patches/server/0277-Add-PreExplodeEvents.patch diff --git a/patches/server/0277-Improve-output-of-plugins-command.patch b/patches/server/0278-Improve-output-of-plugins-command.patch similarity index 100% rename from patches/server/0277-Improve-output-of-plugins-command.patch rename to patches/server/0278-Improve-output-of-plugins-command.patch diff --git a/patches/server/0278-Add-mending-multiplier.patch b/patches/server/0279-Add-mending-multiplier.patch similarity index 100% rename from patches/server/0278-Add-mending-multiplier.patch rename to patches/server/0279-Add-mending-multiplier.patch diff --git a/patches/server/0279-Make-GUI-Great-Again.patch b/patches/server/0280-Make-GUI-Great-Again.patch similarity index 100% rename from patches/server/0279-Make-GUI-Great-Again.patch rename to patches/server/0280-Make-GUI-Great-Again.patch diff --git a/patches/server/0280-Stored-Bee-API.patch b/patches/server/0281-Stored-Bee-API.patch similarity index 100% rename from patches/server/0280-Stored-Bee-API.patch rename to patches/server/0281-Stored-Bee-API.patch diff --git a/patches/server/0281-Shears-can-defuse-TNT.patch b/patches/server/0282-Shears-can-defuse-TNT.patch similarity index 100% rename from patches/server/0281-Shears-can-defuse-TNT.patch rename to patches/server/0282-Shears-can-defuse-TNT.patch diff --git a/patches/server/0282-Explorer-Map-API.patch b/patches/server/0283-Explorer-Map-API.patch similarity index 100% rename from patches/server/0282-Explorer-Map-API.patch rename to patches/server/0283-Explorer-Map-API.patch diff --git a/patches/server/0283-Option-Ocelot-Spawn-Under-Sea-Level.patch b/patches/server/0284-Option-Ocelot-Spawn-Under-Sea-Level.patch similarity index 100% rename from patches/server/0283-Option-Ocelot-Spawn-Under-Sea-Level.patch rename to patches/server/0284-Option-Ocelot-Spawn-Under-Sea-Level.patch diff --git a/patches/server/0284-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch b/patches/server/0285-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch similarity index 100% rename from patches/server/0284-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch rename to patches/server/0285-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch diff --git a/patches/server/0285-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0286-Add-option-for-always-showing-item-in-player-death-m.patch similarity index 92% rename from patches/server/0285-Add-option-for-always-showing-item-in-player-death-m.patch rename to patches/server/0286-Add-option-for-always-showing-item-in-player-death-m.patch index e66c156fb..b2db4abbe 100644 --- a/patches/server/0285-Add-option-for-always-showing-item-in-player-death-m.patch +++ b/patches/server/0286-Add-option-for-always-showing-item-in-player-death-m.patch @@ -18,7 +18,7 @@ index 357a79d72a2de02a019595e457fe432bf409e516..4fb025a63628eb60509d90b680922a02 : Component.translatable(deathTranslationKey, this.mob.getDisplayName(), attackerDisplayName); } diff --git a/src/main/java/net/minecraft/world/damagesource/DamageSource.java b/src/main/java/net/minecraft/world/damagesource/DamageSource.java -index b6881d7f02ad4e9e45e947eaec54f0c6b8ff957a..b206d65750fee0a42b805de24ecbb90078ffabff 100644 +index 812091bf6efc067b21b9723b8241360d4b4c79e7..25e614be19b2b29b36af136b823f27f85e1650fa 100644 --- a/src/main/java/net/minecraft/world/damagesource/DamageSource.java +++ b/src/main/java/net/minecraft/world/damagesource/DamageSource.java @@ -197,7 +197,7 @@ public class DamageSource { @@ -31,10 +31,10 @@ index b6881d7f02ad4e9e45e947eaec54f0c6b8ff957a..b206d65750fee0a42b805de24ecbb900 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index cf2c0642fc09b6f806903a684ccc215b0ad6276f..67a719dc069bc77da38b32ba7d32580c8b7f1207 100644 +index 7f57982ffdd3e571937e9f4a2fa4ac0ea88373f8..d7df39dc0937f37746b17bbad810478d11736f4b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -560,4 +560,9 @@ public class PurpurConfig { +@@ -576,4 +576,9 @@ public class PurpurConfig { block.fallDistanceMultiplier = fallDistanceMultiplier.floatValue(); }); } diff --git a/patches/server/0286-place-end-crystal-on-any-block.patch b/patches/server/0287-place-end-crystal-on-any-block.patch similarity index 100% rename from patches/server/0286-place-end-crystal-on-any-block.patch rename to patches/server/0287-place-end-crystal-on-any-block.patch diff --git a/patches/server/0287-Add-option-to-disable-the-copper-oxidation-proximity.patch b/patches/server/0288-Add-option-to-disable-the-copper-oxidation-proximity.patch similarity index 100% rename from patches/server/0287-Add-option-to-disable-the-copper-oxidation-proximity.patch rename to patches/server/0288-Add-option-to-disable-the-copper-oxidation-proximity.patch diff --git a/patches/server/0288-register-minecraft-debug-commands.patch b/patches/server/0289-register-minecraft-debug-commands.patch similarity index 95% rename from patches/server/0288-register-minecraft-debug-commands.patch rename to patches/server/0289-register-minecraft-debug-commands.patch index 15b540b12..1e5ed3ea9 100644 --- a/patches/server/0288-register-minecraft-debug-commands.patch +++ b/patches/server/0289-register-minecraft-debug-commands.patch @@ -32,10 +32,10 @@ index 8925440dbc35dbc4a7d59f13511d7afeda803260..411f1f8c6be072cfc5ba88cbec38dbc4 io.papermc.paper.plugin.PluginInitializerManager.load(optionset); // Paper diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 67a719dc069bc77da38b32ba7d32580c8b7f1207..df83e258d47fdce819c0f6467e2c0f2d681cb1f9 100644 +index d7df39dc0937f37746b17bbad810478d11736f4b..046304d9149472eaffb3ff5f4fa22a230969de86 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -565,4 +565,9 @@ public class PurpurConfig { +@@ -581,4 +581,9 @@ public class PurpurConfig { private static void playerDeathsAlwaysShowItem() { playerDeathsAlwaysShowItem = getBoolean("settings.player-deaths-always-show-item", playerDeathsAlwaysShowItem); } diff --git a/patches/server/0289-Configurable-villager-search-radius.patch b/patches/server/0290-Configurable-villager-search-radius.patch similarity index 100% rename from patches/server/0289-Configurable-villager-search-radius.patch rename to patches/server/0290-Configurable-villager-search-radius.patch