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

@@ -113,10 +113,10 @@ index 52760eabb45c8d2a3db4056ef219e7ea5cf8d954..53fc3c278624d8c1d2f8bee6df27315d
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d74bb5ae378d3b7a2edcffeb4fc242e855949078..cd8668f9f035b1a0c2c67b18dad4411ce20bf7d7 100644
index b49d5e4edfea04cd916ffa23ea18aaf246898c2a..c6926c5b521fdfc2913d0f130752aca8ccd5fa63 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1002,6 +1002,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1003,6 +1003,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle()) {