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] Disable loot drops on death by cramming
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 791e2b103c7b00e63a3f230cec13a297fa16a545..e83f82a5dc759cab34fb890bbefcb2a2775168d3 100644
index 3138ca1cf56b7c89461b00a9e59c0a983d0fca77..65639d3485f5dad566a3f709eceffedc0848ccaf 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1490,8 +1490,10 @@ public abstract class EntityLiving extends Entity {