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] Add option to set armorstand step height
diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
index 8fef94ad9ac795311fb083a384ed98f1ea860f0a..df3fc83029ea9d06045a3f132f8e85b0c33b0649 100644
index d6de166babe2e25a88f9e6dae462907e26b6fb6f..faa221038df6bed02a2433855ed7c7e0f89c6024 100644
--- a/src/main/java/net/minecraft/server/EntityArmorStand.java
+++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -618,6 +618,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -625,6 +625,7 @@ public class EntityArmorStand extends EntityLiving {
@Override
public void tick() {