From aabf774656c49930705f66da73465acf5a2ad00a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 18 Jul 2019 15:14:12 -0500 Subject: [PATCH] API should also use the better mending if set --- ...ding-mends-most-damages-equipment-first.patch | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/patches/server/0056-Mending-mends-most-damages-equipment-first.patch b/patches/server/0056-Mending-mends-most-damages-equipment-first.patch index 65264247b..c36395649 100644 --- a/patches/server/0056-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0056-Mending-mends-most-damages-equipment-first.patch @@ -1,19 +1,19 @@ -From bac0b84c1dd021bd18531357c46bf97b73f50812 Mon Sep 17 00:00:00 2001 +From 82f95c953bafcb85d15d76d08ba32e52fbebac55 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 14 Jul 2019 19:52:47 -0500 Subject: [PATCH] Mending mends most damages equipment first --- - .../minecraft/server/EnchantmentManager.java | 20 +++++++++++++++++++ + .../minecraft/server/EnchantmentManager.java | 22 ++++++++++++++++++- .../minecraft/server/EntityExperienceOrb.java | 2 +- .../java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - 3 files changed, 26 insertions(+), 1 deletion(-) + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java -index 16e6d95cf1..c8ad7fdf39 100644 +index 16e6d95cf1..b693f2d3d3 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java -@@ -241,6 +241,26 @@ public class EnchantmentManager { +@@ -241,9 +241,29 @@ public class EnchantmentManager { return getEnchantmentLevel(Enchantments.CHANNELING, itemstack) > 0; } @@ -39,7 +39,11 @@ index 16e6d95cf1..c8ad7fdf39 100644 + // Paper - OBFHELPER public static @Nullable ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) { - Entry entry = b(enchantment, entityliving); +- Entry entry = b(enchantment, entityliving); ++ Entry entry = enchantment == Enchantments.MENDING && net.pl3x.purpur.PurpurConfig.useBetterMending ? getMostDamagedEquipment(enchantment, entityliving) : b(enchantment, entityliving); // Purpur + return entry != null ? entry.getValue() : null; + } + @Nullable diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java index 1a98442e08..8a4eedb747 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java