From 0d22bf42411b99685e372b4e4d661bbe15496da1 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 | 25 ++++++++++++++++++- .../minecraft/server/EntityExperienceOrb.java | 2 +- .../java/net/minecraft/server/ItemStack.java | 9 +++++++ .../java/net/pl3x/purpur/PurpurConfig.java | 5 ++++ 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java index 1d16919e..69746fd1 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -241,9 +241,32 @@ public class EnchantmentManager { return getEnchantmentLevel(Enchantments.CHANNELING, itemstack) > 0; } + // Purpur start + @Nullable + public static Entry getMostDamagedEquipment(Enchantment enchantment, EntityLiving entityliving) { + Map map = enchantment.a(entityliving); + if (map.isEmpty()) { + return null; + } + Entry item = null; + float maxPercent = 0F; + for (Entry entry : map.entrySet()) { + ItemStack itemstack = entry.getValue(); + if (!itemstack.isEmpty() && itemstack.isDamaged() && getEnchantmentLevel(enchantment, itemstack) > 0) { + float percent = itemstack.getDamagePercent(); + if (item == null || percent > maxPercent) { + item = entry; + maxPercent = percent; + } + } + } + return item; + } + // Purpur end + // Paper - OBFHELPER public static @Nullable ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving 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 1a98442e..8a4eedb7 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity { if (this.d == 0 && entityhuman.bF == 0 && new com.destroystokyo.paper.event.player.PlayerPickupExperienceEvent(((EntityPlayer) entityhuman).getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) this.getBukkitEntity()).callEvent()) { // Paper entityhuman.bF = 2; entityhuman.receive(this, 1); - Entry entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman); + Entry entry = net.pl3x.purpur.PurpurConfig.useBetterMending ? EnchantmentManager.getMostDamagedEquipment(Enchantments.MENDING, entityhuman) : EnchantmentManager.b(Enchantments.MENDING, entityhuman); // Purpur if (entry != null) { ItemStack itemstack = (ItemStack) entry.getValue(); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java index 0e164840..41e88916 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -364,10 +364,19 @@ public final class ItemStack { } } + public boolean isDamaged() { return f(); } // Purpur - OBFHELPER public boolean f() { return this.e() && this.getDamage() > 0; } + public float getDamagePercent() { + if (isDamaged()) { + return (float) getDamage() / (float) getItem().getMaxDurability(); + } else { + return 0F; + } + } + public int getDamage() { return this.tag == null ? 0 : this.tag.getInt("Damage"); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java index 253e0b31..f8a35064 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -151,6 +151,11 @@ public class PurpurConfig { fixItemPositionDesync = getBoolean("settings.fix-item-position-desync", fixItemPositionDesync); } + public static boolean useBetterMending = true; + private static void useBetterMending() { + useBetterMending = getBoolean("settings.use-better-mending", useBetterMending); + } + public static boolean requireShiftToMount = true; private static void requireShiftToMount() { requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount); -- 2.20.1