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

Fix build (Oops, Paper mistakingly labeled something an OBFHELPER)

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-18 14:59:49 -05:00
parent 86da2ca8ad
commit dc5c6c3679
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From b766921c717b726c90756aecad10a8603016a11c Mon Sep 17 00:00:00 2001 From bac0b84c1dd021bd18531357c46bf97b73f50812 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
@@ -41,7 +41,7 @@ index 16e6d95cf1..c8ad7fdf39 100644
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);
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..0e26302758 100644 index 1a98442e08..8a4eedb747 100644
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
+++ b/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 { @@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity {
@@ -49,7 +49,7 @@ index 1a98442e08..0e26302758 100644
entityhuman.bF = 2; entityhuman.bF = 2;
entityhuman.receive(this, 1); entityhuman.receive(this, 1);
- Entry<EnumItemSlot, ItemStack> entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman); - Entry<EnumItemSlot, ItemStack> entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman);
+ Entry<EnumItemSlot, ItemStack> entry = net.pl3x.purpur.PurpurConfig.useBetterMending ? EnchantmentManager.getMostDamagedEquipment(Enchantments.MENDING, entityhuman) : EnchantmentManager.getRandomEquippedItemWithEnchant(Enchantments.MENDING, entityhuman); // Purpur + Entry<EnumItemSlot, ItemStack> entry = net.pl3x.purpur.PurpurConfig.useBetterMending ? EnchantmentManager.getMostDamagedEquipment(Enchantments.MENDING, entityhuman) : EnchantmentManager.b(Enchantments.MENDING, entityhuman); // Purpur
if (entry != null) { if (entry != null) {
ItemStack itemstack = (ItemStack) entry.getValue(); ItemStack itemstack = (ItemStack) entry.getValue();