Updated Upstream (Paper & Tuinity)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a70924789 [Auto] Updated Upstream (CraftBukkit)

Tuinity Changes:
d1db107 Updated Upstream (Paper)
This commit is contained in:
BillyGalbreath
2020-12-22 16:07:10 -06:00
parent 79d304ff80
commit 8cabaaeced
28 changed files with 116 additions and 70 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0adca10e77d78f1d4d1a4fdfe208ca1f01249e6d..9dfcc915548c07d35ef3b49c8e1d04b0db78ef17 100644
index ea1bccdc776c6eddbad1407cdc31a889875c8909..c2692d6d667d6404a044f1ad1c24e612b6efcd30 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1470,6 +1470,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke