update upstream

This commit is contained in:
Aikar
2018-07-29 12:42:07 -04:00
parent 3cce0c9f1b
commit c33b679642
77 changed files with 260 additions and 273 deletions

View File

@@ -10,7 +10,7 @@ of giving the player experience points.
Both an API To standalone mend, and apply mending logic to .giveExp has been added.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 362467e5..6709168b 100644
index 22b8cb916..805faaf35 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline