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] Implement elytra settings
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index aafaafb4f28ea95fca8ff62a6d6cfaf0b2fb42d0..4ffad61ce7ec81e9e329c117c9d122c51dbb4f69 100644
index 8d2586be431fb5ae828e822a2aaa9b7102f9a352..4e1796c06b35c8d262f67900f5079ecd42fa03df 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2836,7 +2836,16 @@ public abstract class EntityLiving extends Entity {
@@ -2842,7 +2842,16 @@ public abstract class EntityLiving extends Entity {
if (itemstack.getItem() == Items.ELYTRA && ItemElytra.d(itemstack)) {
flag = true;
if (!this.world.isClientSide && (this.be + 1) % 20 == 0) {