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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
01b965e0 Fix getChunkAtIfCachedImmediately (#2915)
0a897d6e Rebuild patches
5792c862 Updated Upstream (Bukkit/CraftBukkit/Spigot)
c9eebbb8 Fix Player#applyMending NPE (#2917)
d16a5d88 Performance patches prerequisite (#2802)
This commit is contained in:
William Blake Galbreath
2020-01-29 21:58:09 -06:00
parent 8439e5b604
commit ddf1f8a586
17 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0038-Mending-mends-most-damages-equipment-first.patch
View File

@@ -1,4 +1,4 @@
From 81f8ef12bb7e7269371fd4d472f97dcc40b0a074 Mon Sep 17 00:00:00 2001
From 66f5145a4f2f12ad8346fcc523eecdbb4ef1e3f8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 14 Jul 2019 19:52:47 -0500
Subject: [PATCH] Mending mends most damages equipment first
@@ -11,7 +11,7 @@ Subject: [PATCH] Mending mends most damages equipment first
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 fabc7a8dd7..5dc6b92f69 100644
index d96c03a1a1..79f9a8776f 100644
--- a/src/main/java/net/minecraft/server/EnchantmentManager.java
+++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
@@ -246,9 +246,32 @@ public class EnchantmentManager {
@@ -42,10 +42,10 @@ index fabc7a8dd7..5dc6b92f69 100644
+ // Purpur end
+
// Paper - OBFHELPER
public static @Nullable ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) {
public static @javax.annotation.Nonnull ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving 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;
return entry != null ? entry.getValue() : ItemStack.NULL_ITEM;
}
@Nullable
diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -62,7 +62,7 @@ index 53c6c33892..462e0976a4 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 df85f9df0a..222a8fdc3b 100644
index d6e43313bf..72ce83a2d9 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -369,10 +369,19 @@ public final class ItemStack {
@@ -86,7 +86,7 @@ index df85f9df0a..222a8fdc3b 100644
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 ef00ce307e..1a49dd4d80 100644
index 8396509c88..83112e6ec0 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 {
@@ -102,5 +102,5 @@ index ef00ce307e..1a49dd4d80 100644
private static void requireShiftToMount() {
requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
--
2.24.0.rc1
2.24.0