Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
40b3461 [ci skip] Use commit timestamp instead of build time in manifest (#6161)
664eee6 Expand resource pack API
b015abb Fix missing annotation
This commit is contained in:
William Blake Galbreath
2021-07-13 18:21:24 -05:00
parent b54cce441f
commit 4626edf67b
13 changed files with 49 additions and 41 deletions

View File

@@ -26,10 +26,10 @@ index b60e38add38ac58d01f419dcb1b07a9b79bf1cb8..e2b2ee49f9b8220c2de3f26389e78b63
} else {
if (fallDistance >= 2.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cd8668f9f035b1a0c2c67b18dad4411ce20bf7d7..60e882e0fad1d9153f10cdc42e3c1d43a7642bc1 100644
index c6926c5b521fdfc2913d0f130752aca8ccd5fa63..25aeee5e87094def26bca5710cc355ea11a525a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2576,5 +2576,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2590,5 +2590,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}