From c04a5138664bc96076f6aca85d83c859bd70a183 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 1 Aug 2019 12:52:07 -0500 Subject: [PATCH] Fix better mending to use damage percent instead of damage amount --- ...g-mends-most-damages-equipment-first.patch | 48 +++++++++++++++---- .../0048-Implement-elytra-settings.patch | 8 ++-- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/patches/server/0041-Mending-mends-most-damages-equipment-first.patch b/patches/server/0041-Mending-mends-most-damages-equipment-first.patch index 0b0cc9b96..74140f907 100644 --- a/patches/server/0041-Mending-mends-most-damages-equipment-first.patch +++ b/patches/server/0041-Mending-mends-most-damages-equipment-first.patch @@ -1,19 +1,20 @@ -From e02078a503427b52f6ec569ae026bd2706034d7e Mon Sep 17 00:00:00 2001 +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 | 22 ++++++++++++++++++- + .../minecraft/server/EnchantmentManager.java | 25 ++++++++++++++++++- .../minecraft/server/EntityExperienceOrb.java | 2 +- - .../java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ - 3 files changed, 27 insertions(+), 2 deletions(-) + .../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 1d16919e6..e3bc32a77 100644 +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,29 @@ public class EnchantmentManager { +@@ -241,9 +241,32 @@ public class EnchantmentManager { return getEnchantmentLevel(Enchantments.CHANNELING, itemstack) > 0; } @@ -25,11 +26,14 @@ index 1d16919e6..e3bc32a77 100644 + return null; + } + Entry item = null; ++ float maxPercent = 0F; + for (Entry entry : map.entrySet()) { + ItemStack itemstack = entry.getValue(); -+ if (!itemstack.isEmpty() && getEnchantmentLevel(enchantment, itemstack) > 0) { -+ if (item == null || itemstack.getDamage() > item.getValue().getDamage()) { ++ if (!itemstack.isEmpty() && itemstack.isDamaged() && getEnchantmentLevel(enchantment, itemstack) > 0) { ++ float percent = itemstack.getDamagePercent(); ++ if (item == null || percent > maxPercent) { + item = entry; ++ maxPercent = percent; + } + } + } @@ -45,7 +49,7 @@ index 1d16919e6..e3bc32a77 100644 } @Nullable diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 1a98442e0..8a4eedb74 100644 +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 { @@ -57,8 +61,32 @@ index 1a98442e0..8a4eedb74 100644 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 c4afafc59..400b7d212 100644 +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 { diff --git a/patches/server/0048-Implement-elytra-settings.patch b/patches/server/0048-Implement-elytra-settings.patch index f781df190..98bf326cf 100644 --- a/patches/server/0048-Implement-elytra-settings.patch +++ b/patches/server/0048-Implement-elytra-settings.patch @@ -1,4 +1,4 @@ -From 65faec0d7231fcc6398d09453e4ce4cf4632014b Mon Sep 17 00:00:00 2001 +From 94c7706024d3ed24336b9985ceedcf34b8a96620 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 25 Jul 2019 18:07:37 -0500 Subject: [PATCH] Implement elytra settings @@ -64,10 +64,10 @@ index 9e86ef4c..832cea63 100644 itemstack.subtract(1); } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 0e164840..d9b63547 100644 +index 41e88916..43e89b99 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java -@@ -393,7 +393,7 @@ public final class ItemStack { +@@ -402,7 +402,7 @@ public final class ItemStack { int j; if (i > 0) { @@ -76,7 +76,7 @@ index 0e164840..d9b63547 100644 int k = 0; for (int l = 0; j > 0 && l < i; ++l) { -@@ -439,6 +439,12 @@ public final class ItemStack { +@@ -448,6 +448,12 @@ public final class ItemStack { if (this.isDamaged(i, t0.getRandom(), t0 instanceof EntityPlayer ? (EntityPlayer) t0 : null)) { consumer.accept(t0); Item item = this.getItem();