Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
5486b3db Fix javadocs failing jenkins builds (#4189)
1330eb5f Brand support
This commit is contained in:
William Blake Galbreath
2020-08-23 20:39:32 -05:00
parent 79b0a9b0e7
commit 6ee7cbceeb
14 changed files with 51 additions and 83 deletions

View File

@@ -81,10 +81,10 @@ index 000000000..0c8b3e5e4
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b584f8b15..9dbfe3614 100644
index 991f757a8..472194e7e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1877,4 +1877,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -1887,4 +1887,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end