Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +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:
aba49696 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2019-08-30 11:31:47 -05:00
parent eb7c1fbad9
commit 73a03c746b
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 0d22bf42411b99685e372b4e4d661bbe15496da1 Mon Sep 17 00:00:00 2001
From b6bb5c2e6b611b805eeaf9788eac48144d910e18 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 1d16919e..69746fd1 100644
index 1d16919e6..69746fd1b 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 {
@@ -49,10 +49,10 @@ index 1d16919e..69746fd1 100644
}
@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
index d8f23ff02..305504f0f 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 {
@@ -225,7 +225,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);
@@ -62,7 +62,7 @@ index 1a98442e..8a4eedb7 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
index 0e164840f..41e889165 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 {
@@ -86,7 +86,7 @@ index 0e164840..41e88916 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 253e0b31..f8a35064 100644
index b0f5c3db3..938cd4291 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 253e0b31..f8a35064 100644
private static void requireShiftToMount() {
requireShiftToMount = getBoolean("settings.mobs.require-shift-to-mount", requireShiftToMount);
--
2.20.1
2.23.0.rc1