update upstream

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

View file

@ -5,7 +5,7 @@ Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 116a1e7a..0481f15b 100644
index d3965bb38..4412f6eea 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