Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
abca14ff9 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
jmp
2020-12-21 00:45:03 -08:00
parent 25c7772584
commit 3b18ff8cb9
28 changed files with 68 additions and 75 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 6046b4788ba8f170e6f5fa021750936f108ab195..3ae8296c29f85d7713ce3186ca463939256d7cda 100644
index e6b390709d7e3d8596a7814422e4d41fba0c11c2..03a6a96406ba13ffe3031aacd4a6f6a9d88b9b72 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -1318,6 +1318,19 @@ public abstract class EntityLiving extends Entity {
@@ -1324,6 +1324,19 @@ public abstract class EntityLiving extends Entity {
}
}