From 49dc4959d601287aeb93c6fb181a313d3daa7f9b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 13 Oct 2020 20:04:54 -0500 Subject: [PATCH] Allow infinite and mending enchantments together --- ...te-and-mending-enchantments-together.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 patches/server/0136-Allow-infinite-and-mending-enchantments-together.patch diff --git a/patches/server/0136-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0136-Allow-infinite-and-mending-enchantments-together.patch new file mode 100644 index 000000000..3816d558d --- /dev/null +++ b/patches/server/0136-Allow-infinite-and-mending-enchantments-together.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Tue, 13 Oct 2020 20:04:33 -0500 +Subject: [PATCH] Allow infinite and mending enchantments together + + +diff --git a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java +index 408cfa460..78dc2d925 100644 +--- a/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java ++++ b/src/main/java/net/minecraft/server/EnchantmentInfiniteArrows.java +@@ -23,6 +23,6 @@ public class EnchantmentInfiniteArrows extends Enchantment { + + @Override + public boolean a(Enchantment enchantment) { +- return enchantment instanceof EnchantmentMending ? false : super.a(enchantment); ++ return enchantment instanceof EnchantmentMending ? net.pl3x.purpur.PurpurConfig.allowInfiniteMending : super.a(enchantment); // Purpur + } + } +diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java +index d33d24af6..aea57edcc 100644 +--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java ++++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java +@@ -194,6 +194,11 @@ public class PurpurConfig { + cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame); + } + ++ public static boolean allowInfiniteMending = false; ++ private static void enchantmentSettings() { ++ allowInfiniteMending = getBoolean("settings.enchantment.allow-infinite-and-mending-together", allowInfiniteMending); ++ } ++ + public static boolean endermanShortHeight = false; + private static void entitySettings() { + endermanShortHeight = getBoolean("settings.entity.enderman.short-height", endermanShortHeight);