Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
3148b25b1 [CI-SKIP] [Auto] Rebuild Patches
880a910a9 Properly track block update flags (actually fixes #5038)
ace3146df Fix debug stick update suppression (Fixes #5038)
bb4247f86 Fix dumpitem command not checking sender (#5025)
b72a74e48 nerf nether search radius config (#4781)
This commit is contained in:
jmp
2021-01-11 12:48:40 -08:00
parent e126e38336
commit 885092f773
25 changed files with 54 additions and 54 deletions

View File

@@ -46,10 +46,10 @@ index e775fe69ee7e555721bc73e7cb0dd3136736bc9c..990eb656699d9ead26b42fbb305530b7
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 0d011a1aae667f473f1ad2ec60d8506cd32dff6d..623bcb93cbdf0f67ee999104936f9d60c5228037 100644
index c7931ff47498ba75b2cb29abccc6851e36109ce2..f5802f14b84a5b177ddbdb53a6c3ce892ef310f6 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -450,7 +450,7 @@ public final class ItemStack {
@@ -445,7 +445,7 @@ public final class ItemStack {
int j;
if (i > 0) {
@@ -58,7 +58,7 @@ index 0d011a1aae667f473f1ad2ec60d8506cd32dff6d..623bcb93cbdf0f67ee999104936f9d60
int k = 0;
for (int l = 0; j > 0 && l < i; ++l) {
@@ -496,6 +496,12 @@ public final class ItemStack {
@@ -491,6 +491,12 @@ public final class ItemStack {
if (this.isDamaged(i, t0.getRandom(), t0 instanceof EntityPlayer ? (EntityPlayer) t0 : null)) {
consumer.accept(t0);
Item item = this.getItem();