diff --git a/patches/server/0153-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0153-Config-to-allow-for-unsafe-enchants.patch index c6170a1de..000e45e72 100644 --- a/patches/server/0153-Config-to-allow-for-unsafe-enchants.patch +++ b/patches/server/0153-Config-to-allow-for-unsafe-enchants.patch @@ -27,7 +27,7 @@ index 664cbce2e06fcb95d3d3d6c5302fc9119f938925..bc9778c705d23acd84fa1cdeff6b403b ++i; } else if (targets.size() == 1) { diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -index 8a7c30e316db4960b0b62ca0e366c19febead214..29ba769c5f803ce2dc5285e65284febf9ee28eb2 100644 +index 8a7c30e316db4960b0b62ca0e366c19febead214..fdf2bf10a533c3d4ee145880e6949dadf6ce5410 100644 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java @@ -228,7 +228,8 @@ public class AnvilMenu extends ItemCombinerMenu { @@ -40,12 +40,16 @@ index 8a7c30e316db4960b0b62ca0e366c19febead214..29ba769c5f803ce2dc5285e65284febf if (this.player.getAbilities().instabuild || itemstack.is(Items.ENCHANTED_BOOK)) { flag3 = true; -@@ -240,16 +241,16 @@ public class AnvilMenu extends ItemCombinerMenu { +@@ -240,16 +241,20 @@ public class AnvilMenu extends ItemCombinerMenu { Enchantment enchantment1 = (Enchantment) iterator1.next(); if (enchantment1 != enchantment && !enchantment.isCompatibleWith(enchantment1)) { - flag3 = canDoUnsafeEnchants; // Purpur + flag4 = canDoUnsafeEnchants || (org.purpurmc.purpur.PurpurConfig.allowUnsafeEnchants && org.purpurmc.purpur.PurpurConfig.allowIncompatibleEnchants); // Purpur flag3 -> flag4 ++ if (!flag4 && org.purpurmc.purpur.PurpurConfig.replaceIncompatibleEnchants) { ++ iterator1.remove(); ++ flag4 = true; ++ } ++i; } } @@ -60,7 +64,7 @@ index 8a7c30e316db4960b0b62ca0e366c19febead214..29ba769c5f803ce2dc5285e65284febf i2 = enchantment.getMaxLevel(); } -@@ -389,7 +390,7 @@ public class AnvilMenu extends ItemCombinerMenu { +@@ -389,7 +394,7 @@ public class AnvilMenu extends ItemCombinerMenu { sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client this.broadcastChanges(); // Purpur start @@ -87,10 +91,10 @@ index 33548cd10758f3cc891c40d760b9e0a86dc8a2cb..a7909c60a17ab004ab8f6cd39abb2118 this.getOrCreateTag().put(key, element); } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 55963ed03a2e552636035b498cf7441bd4c3ee59..0ebd43cf4163e2f3b06d1f6475421c03e08a1bd5 100644 +index 55963ed03a2e552636035b498cf7441bd4c3ee59..5697ce5ead8dc7e463206a56d489c99c861a9bb1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -285,14 +285,32 @@ public class PurpurConfig { +@@ -285,14 +285,34 @@ public class PurpurConfig { public static boolean allowInfinityMending = false; public static boolean allowCrossbowInfinity = false; @@ -99,6 +103,7 @@ index 55963ed03a2e552636035b498cf7441bd4c3ee59..0ebd43cf4163e2f3b06d1f6475421c03 + public static boolean allowIncompatibleEnchants = true; + public static boolean allowHigherEnchantsLevels = true; + public static boolean allowUnsafeEnchantCommand = false; ++ public static boolean replaceIncompatibleEnchants = false; private static void enchantmentSettings() { if (version < 5) { boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false); @@ -120,6 +125,7 @@ index 55963ed03a2e552636035b498cf7441bd4c3ee59..0ebd43cf4163e2f3b06d1f6475421c03 + allowIncompatibleEnchants = getBoolean("settings.enchantment.anvil.allow-incompatible-enchants", allowIncompatibleEnchants); + 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); } public static boolean endermanShortHeight = false; diff --git a/patches/server/0172-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0172-Make-anvil-cumulative-cost-configurable.patch index 721f5f3ba..e48a72e76 100644 --- a/patches/server/0172-Make-anvil-cumulative-cost-configurable.patch +++ b/patches/server/0172-Make-anvil-cumulative-cost-configurable.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Make anvil cumulative cost configurable diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -index 29ba769c5f803ce2dc5285e65284febf9ee28eb2..cb4a1cd39f12d90d30dd95efa2de58f57d9c6ee0 100644 +index fdf2bf10a533c3d4ee145880e6949dadf6ce5410..531b911c1bcdd3735529ee18f2bb0ccdf4ad6089 100644 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java -@@ -399,7 +399,7 @@ public class AnvilMenu extends ItemCombinerMenu { +@@ -403,7 +403,7 @@ public class AnvilMenu extends ItemCombinerMenu { } public static int calculateIncreasedRepairCost(int cost) { @@ -18,7 +18,7 @@ index 29ba769c5f803ce2dc5285e65284febf9ee28eb2..cb4a1cd39f12d90d30dd95efa2de58f5 public boolean setItemName(String newItemName) { diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 566e71e92f7bc58dc6c5518c91cbd07dd157cb12..2aaa4cff8d02c35bfe194b548027be904e1cf982 100644 +index bda7ebcedcfc7086dcbd3a402e4c5ace3c508037..cb0125f7aaa514578465d455b2b1fab98d7b13c1 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -269,6 +269,7 @@ public class PurpurConfig { diff --git a/patches/server/0220-UPnP-Port-Forwarding.patch b/patches/server/0220-UPnP-Port-Forwarding.patch index 2d6e56110..62cac0574 100644 --- a/patches/server/0220-UPnP-Port-Forwarding.patch +++ b/patches/server/0220-UPnP-Port-Forwarding.patch @@ -67,10 +67,10 @@ index 012c990efb2647b0a3e983b23fed98c6e3f2224b..62c437f5618032b78d1b68c5c2490d4d // 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 19313ea70f105e71019947e34669384472b0aaab..37764d22804fecf704963d3208039834f1525b0d 100644 +index f3449eb7a1433a8420c0de6f4649f0fae70b2294..f6cd1c56dcc3f7d118edc6d7a63e42da166ebd5f 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -417,4 +417,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/0234-Configurable-valid-characters-for-usernames.patch b/patches/server/0234-Configurable-valid-characters-for-usernames.patch index 9dcad05d5..664d05272 100644 --- a/patches/server/0234-Configurable-valid-characters-for-usernames.patch +++ b/patches/server/0234-Configurable-valid-characters-for-usernames.patch @@ -18,10 +18,10 @@ index b4b88a3d4dc66c44ca8f3bad1025c17a9993ac1d..01d5fa265fb2818465b5a71a2e2efeec char c = in.charAt(i); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index b359b106f51e68d8a1e59d40dff75d656cd3b6e4..d22ffa006e5c39ebe5f94c41b62aebf11d07b80f 100644 +index f562729f543ef2b5998c6c38c0a08b3ae4dab1bf..d56c2776d08306245618dca04cd39891bb61c1bd 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -450,4 +450,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/0235-Shears-can-have-looting-enchantment.patch b/patches/server/0235-Shears-can-have-looting-enchantment.patch index 9d8d78d7a..5a2131cef 100644 --- a/patches/server/0235-Shears-can-have-looting-enchantment.patch +++ b/patches/server/0235-Shears-can-have-looting-enchantment.patch @@ -158,7 +158,7 @@ index 4007c16550683e23b396dfdff29530a82523fe05..8fe09c13643d99639fb242da4367c42e public int getMinCost(int level) { return 15 + (level - 1) * 9; diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index d22ffa006e5c39ebe5f94c41b62aebf11d07b80f..9a9e223aea463050f81ea7eadef778ea6b8401c7 100644 +index d56c2776d08306245618dca04cd39891bb61c1bd..730a4a2e46aeb233d8036e8d7e1749dcb397e6c0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java @@ -391,6 +391,7 @@ public class PurpurConfig { @@ -169,7 +169,7 @@ index d22ffa006e5c39ebe5f94c41b62aebf11d07b80f..9a9e223aea463050f81ea7eadef778ea public static boolean allowUnsafeEnchants = false; public static boolean allowInapplicableEnchants = true; public static boolean allowIncompatibleEnchants = true; -@@ -412,6 +413,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/0242-Configurable-food-attributes.patch b/patches/server/0242-Configurable-food-attributes.patch index ed0440d82..f13cde73e 100644 --- a/patches/server/0242-Configurable-food-attributes.patch +++ b/patches/server/0242-Configurable-food-attributes.patch @@ -69,10 +69,10 @@ index 31f5ed9dd1727eee24804a384817d2b76a45676b..5fbb13ebef0ca66419f3e5006d19e4a5 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 9a9e223aea463050f81ea7eadef778ea6b8401c7..07f5c71baefedce1237003a1bee193240a5b9af5 100644 +index 730a4a2e46aeb233d8036e8d7e1749dcb397e6c0..fa81039056af14c37426a508b7b2da77e8b50737 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -459,4 +459,75 @@ public class PurpurConfig { +@@ -461,4 +461,75 @@ 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/0243-Max-joins-per-second.patch b/patches/server/0243-Max-joins-per-second.patch index 7a0eedc0e..8b6a30d7c 100644 --- a/patches/server/0243-Max-joins-per-second.patch +++ b/patches/server/0243-Max-joins-per-second.patch @@ -31,10 +31,10 @@ index cf20f0983fc25b26cf92b9d3a28746b1909fc56b..89c1b69ddeb420c2fbda5f588e7c9a46 } // Paper end diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 07f5c71baefedce1237003a1bee193240a5b9af5..abea0905cc8a1ce6bffd4f2e581faea38ddd5b13 100644 +index fa81039056af14c37426a508b7b2da77e8b50737..44e8822dae170c07e48ae016826a6710b7d7e29a 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -449,8 +449,10 @@ public class PurpurConfig { +@@ -451,8 +451,10 @@ public class PurpurConfig { } public static boolean useUPnP = false; diff --git a/patches/server/0251-Add-toggle-for-enchant-level-clamping.patch b/patches/server/0251-Add-toggle-for-enchant-level-clamping.patch index e22aab90e..0ec4dbe62 100644 --- a/patches/server/0251-Add-toggle-for-enchant-level-clamping.patch +++ b/patches/server/0251-Add-toggle-for-enchant-level-clamping.patch @@ -31,21 +31,21 @@ index 2048899f8e4c8211e8dde0d11148d647678009fa..1eec84e217f6dc929091fa7451cd235e @Nullable diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index abea0905cc8a1ce6bffd4f2e581faea38ddd5b13..33a67078ba6ecc11d2929a164354702664d6a480 100644 +index 44e8822dae170c07e48ae016826a6710b7d7e29a..4d147845402a26957c905dd600bf0657bb7bd714 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -397,6 +397,7 @@ public class PurpurConfig { - public static boolean allowIncompatibleEnchants = true; +@@ -398,6 +398,7 @@ public class PurpurConfig { public static boolean allowHigherEnchantsLevels = true; public static boolean allowUnsafeEnchantCommand = false; + public static boolean replaceIncompatibleEnchants = false; + public static boolean clampEnchantLevels = true; private static void enchantmentSettings() { if (version < 5) { boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false); -@@ -419,6 +420,7 @@ public class PurpurConfig { - allowIncompatibleEnchants = getBoolean("settings.enchantment.anvil.allow-incompatible-enchants", allowIncompatibleEnchants); +@@ -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); + clampEnchantLevels = getBoolean("settings.enchantment.clamp-levels", clampEnchantLevels); } diff --git a/patches/server/0260-Option-to-disable-kick-for-out-of-order-chat.patch b/patches/server/0260-Option-to-disable-kick-for-out-of-order-chat.patch index 1acbb3daf..a8be2efe8 100644 --- a/patches/server/0260-Option-to-disable-kick-for-out-of-order-chat.patch +++ b/patches/server/0260-Option-to-disable-kick-for-out-of-order-chat.patch @@ -18,10 +18,10 @@ index cb1851fca9290edb502662c100bb2ac6fa4d70d1..b1050654cca5ce8a834c9e913b8e8046 } while (!this.lastChatTimeStamp.compareAndSet(instant1, timestamp)); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 15eb4403deefca5f16052a74bbd9059091ed4c3f..6191efac8add7d45747036e07c7e895a70f6ff7b 100644 +index e78e809cc7644d5007b149d5940f8cc164a76975..ed9b2f0b55229848894d9d6b401d050cb031b893 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -454,9 +454,11 @@ public class PurpurConfig { +@@ -456,9 +456,11 @@ public class PurpurConfig { public static boolean useUPnP = false; public static boolean maxJoinsPerSecond = false; diff --git a/patches/server/0279-Add-item-packet-serialize-event.patch b/patches/server/0279-Add-item-packet-serialize-event.patch index 40a3a1d10..0174a055b 100644 --- a/patches/server/0279-Add-item-packet-serialize-event.patch +++ b/patches/server/0279-Add-item-packet-serialize-event.patch @@ -65,10 +65,10 @@ index 9b488a98fdf06515ff267040dd6d654004665207..9cc3ab8cd3f7ab7f8fbf4d9d14f25ea0 boolean flag1 = packet.getSlotNum() >= 1 && packet.getSlotNum() <= 45; boolean flag2 = itemstack.isEmpty() || itemstack.getDamageValue() >= 0 && itemstack.getCount() <= 64 && !itemstack.isEmpty(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 77d927a28eb01aae3a49be3e7b7a5fe219b7739d..7fc62c524f2df054ce7fa9399cda155a134477d1 100644 +index 568bb53e91dda4804cd328a81ba12ce735c52603..62aabfc021fa3349b0ab46744a9ec78d57f058b0 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -561,4 +561,9 @@ public class PurpurConfig { +@@ -563,4 +563,9 @@ public class PurpurConfig { } }); } diff --git a/patches/server/0280-Add-an-option-to-fix-MC-3304-projectile-looting.patch b/patches/server/0280-Add-an-option-to-fix-MC-3304-projectile-looting.patch index a67c4ed28..b24108886 100644 --- a/patches/server/0280-Add-an-option-to-fix-MC-3304-projectile-looting.patch +++ b/patches/server/0280-Add-an-option-to-fix-MC-3304-projectile-looting.patch @@ -104,10 +104,10 @@ index 31918fa2eb38e42a5ea5366e559f25ea9d7d59ae..15d8e9261a89da30529ac347462c5209 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 7fc62c524f2df054ce7fa9399cda155a134477d1..3a6eac678f1ab96ce1501a9951592faabed1e288 100644 +index 62aabfc021fa3349b0ab46744a9ec78d57f058b0..32aaa66acc35950caec1a0b0dac9413e950b37a6 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -566,4 +566,9 @@ public class PurpurConfig { +@@ -568,4 +568,9 @@ public class PurpurConfig { private static void fixNetworkSerializedCreativeItems() { fixNetworkSerializedItemsInCreative = getBoolean("settings.fix-network-serialized-items-in-creative", fixNetworkSerializedItemsInCreative); } diff --git a/patches/server/0281-Configurable-block-blast-resistance.patch b/patches/server/0281-Configurable-block-blast-resistance.patch index 245be967b..9fc5ce17f 100644 --- a/patches/server/0281-Configurable-block-blast-resistance.patch +++ b/patches/server/0281-Configurable-block-blast-resistance.patch @@ -18,10 +18,10 @@ index 5ac102afde62c08f36886b466010ccfedabfa05e..942ce713afe27ec75d849877a88721ef 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 3a6eac678f1ab96ce1501a9951592faabed1e288..f52d82e3d16a0b94ece4530a4f0ca3196a1c09b0 100644 +index 32aaa66acc35950caec1a0b0dac9413e950b37a6..8426be7906cd0f4df8c274aa1d113388965d8d8b 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -571,4 +571,19 @@ public class PurpurConfig { +@@ -573,4 +573,19 @@ public class PurpurConfig { private static void fixProjectileLootingTransfer() { fixProjectileLootingTransfer = getBoolean("settings.fix-projectile-looting-transfer", fixProjectileLootingTransfer); } diff --git a/patches/server/0282-Configurable-block-fall-damage-modifiers.patch b/patches/server/0282-Configurable-block-fall-damage-modifiers.patch index 67a22e0b9..ae3343513 100644 --- a/patches/server/0282-Configurable-block-fall-damage-modifiers.patch +++ b/patches/server/0282-Configurable-block-fall-damage-modifiers.patch @@ -54,10 +54,10 @@ index cfbe1dae76db76cf54a4f5d72aca72d5e893859e..74cb10230d459ac9f300a9d59af504d2 } } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index f52d82e3d16a0b94ece4530a4f0ca3196a1c09b0..057a43a157d976526fc515d10f8b62fd69a41385 100644 +index 8426be7906cd0f4df8c274aa1d113388965d8d8b..29dd74f28c66cce2c25dc9aa916f230cdfbe2da3 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -586,4 +586,50 @@ public class PurpurConfig { +@@ -588,4 +588,50 @@ public class PurpurConfig { block.explosionResistance = blastResistance.floatValue(); }); } diff --git a/patches/server/0286-Add-log-suppression-for-LibraryLoader.patch b/patches/server/0286-Add-log-suppression-for-LibraryLoader.patch index 0da9c6a0a..6a689fce9 100644 --- a/patches/server/0286-Add-log-suppression-for-LibraryLoader.patch +++ b/patches/server/0286-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 057a43a157d976526fc515d10f8b62fd69a41385..e6aab22248b463e088f50acf6275e364ea4b0809 100644 +index 29dd74f28c66cce2c25dc9aa916f230cdfbe2da3..cf0a52a037ac255c3f9e36dbff3cedda0fd8f49e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -463,11 +463,14 @@ public class PurpurConfig { +@@ -465,11 +465,14 @@ public class PurpurConfig { public static boolean loggerSuppressIgnoredAdvancementWarnings = false; public static boolean loggerSuppressUnrecognizedRecipeErrors = false; public static boolean loggerSuppressSetBlockFarChunk = false; diff --git a/patches/server/0294-Add-attribute-clamping-and-armor-limit-config.patch b/patches/server/0294-Add-attribute-clamping-and-armor-limit-config.patch index ad3d76809..c68108985 100644 --- a/patches/server/0294-Add-attribute-clamping-and-armor-limit-config.patch +++ b/patches/server/0294-Add-attribute-clamping-and-armor-limit-config.patch @@ -36,10 +36,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 e6aab22248b463e088f50acf6275e364ea4b0809..87834a0d2bde9588abb89525ad8ac8fc6afd1a2f 100644 +index cf0a52a037ac255c3f9e36dbff3cedda0fd8f49e..f10679ef2cbd73397b64eb69516c8a46e4d35a4e 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -575,6 +575,16 @@ public class PurpurConfig { +@@ -577,6 +577,16 @@ public class PurpurConfig { fixProjectileLootingTransfer = getBoolean("settings.fix-projectile-looting-transfer", fixProjectileLootingTransfer); } diff --git a/patches/server/0306-Add-option-for-always-showing-item-in-player-death-m.patch b/patches/server/0306-Add-option-for-always-showing-item-in-player-death-m.patch index f5e73c350..c9c2a1c99 100644 --- a/patches/server/0306-Add-option-for-always-showing-item-in-player-death-m.patch +++ b/patches/server/0306-Add-option-for-always-showing-item-in-player-death-m.patch @@ -31,10 +31,10 @@ index fc1fb63ee0e28b8d1f065bfad716b465cde5a69f..c8860f20956a2819da001e9393824945 } diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -index 87834a0d2bde9588abb89525ad8ac8fc6afd1a2f..3029f38cff6755b31427efb7fae3b6886ee8e4ee 100644 +index f10679ef2cbd73397b64eb69516c8a46e4d35a4e..3633574e112f217b412217dd243a631dc4e9c40c 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java -@@ -645,4 +645,9 @@ public class PurpurConfig { +@@ -647,4 +647,9 @@ public class PurpurConfig { block.fallDistanceMultiplier = fallDistanceMultiplier.floatValue(); }); }