Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
86daffa2 Fix AssertionError when player hand set to empty type
This commit is contained in:
William Blake Galbreath
2019-12-09 19:28:05 -06:00
parent 8cb622fe75
commit fbc3f0d6bf
10 changed files with 133 additions and 133 deletions

View File

@@ -1,4 +1,4 @@
From bcf6c9b4668bc6328c419236371755f9302f0a46 Mon Sep 17 00:00:00 2001
From 90e2b818af21de79de11ebcf0020b6c89f9ce293 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 18 Oct 2019 23:34:48 -0500
Subject: [PATCH] Add entity jump API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add entity jump API
2 files changed, 16 insertions(+)
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 2136836748..b59b1ab19c 100644
index b5f0b01c36..fbe13d9dac 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2556,8 +2556,10 @@ public abstract class EntityLiving extends Entity {
@@ -2557,8 +2557,10 @@ public abstract class EntityLiving extends Entity {
} else if (this.aD()) {
this.c(TagsFluid.LAVA);
} else if ((this.onGround || this.Q > 0.0D && this.Q <= 0.4D) && this.jumpTicks == 0) {