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

@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 252f6220f7cb8dd4bf9c19ec4079819e5b052f44..303dbf3696a7d56b2def1beb485344e81e781857 100644
index 7be8c47bdb8cc73c039efe05d81085cdbe0bef58..3197dee574327da2d1aa65f775ee3f53b88d5d85 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2166,4 +2166,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2230,4 +2230,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end