Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

API should also use the better mending if set

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-18 15:14:12 -05:00
parent dc5c6c3679
commit aabf774656
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0056-Mending-mends-most-damages-equipment-first.patch
View File

@@ -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 <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 14 Jul 2019 19:52:47 -0500 Date: Sun, 14 Jul 2019 19:52:47 -0500
Subject: [PATCH] Mending mends most damages equipment first Subject: [PATCH] Mending mends most damages equipment first
--- ---
.../minecraft/server/EnchantmentManager.java | 20 +++++++++++++++++++ .../minecraft/server/EnchantmentManager.java | 22 ++++++++++++++++++-
.../minecraft/server/EntityExperienceOrb.java | 2 +- .../minecraft/server/EntityExperienceOrb.java | 2 +-
.../java/net/pl3x/purpur/PurpurConfig.java | 5 +++++ .../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 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 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
+++ b/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; return getEnchantmentLevel(Enchantments.CHANNELING, itemstack) > 0;
} }
@@ -39,7 +39,11 @@ index 16e6d95cf1..c8ad7fdf39 100644
+ +
// Paper - OBFHELPER // Paper - OBFHELPER
public static @Nullable ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) { public static @Nullable ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) {
Entry<EnumItemSlot, ItemStack> entry = b(enchantment, entityliving); - Entry<EnumItemSlot, ItemStack> entry = b(enchantment, entityliving);
+ Entry<EnumItemSlot, ItemStack> 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 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
index 1a98442e08..8a4eedb747 100644 index 1a98442e08..8a4eedb747 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java