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

@@ -54,10 +54,10 @@ index c2be0c2bc315876f120cff207e5516dda2bd55d7..358d6d660581686a2e8d49e13e8c2ade
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 fcdb82a4e54810a7da9f5d4e6a0d975c23a24884..0d011a1aae667f473f1ad2ec60d8506cd32dff6d 100644
index 8c3d78f1ac30463b6592aaf65157e579f9ac87a3..c7931ff47498ba75b2cb29abccc6851e36109ce2 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -418,10 +418,19 @@ public final class ItemStack {
@@ -413,10 +413,19 @@ public final class ItemStack {
}
}