Update upstream B/S

This commit is contained in:
Zach Brown
2017-05-23 17:11:28 -05:00
parent b39f2133a1
commit 16113437c6
20 changed files with 26 additions and 26 deletions

View File

@@ -3457,7 +3457,7 @@ index a8f61f2d..00000000
- // Spigot end
-}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 9764caa4..266181aa 100644
index 70eb5eec..845c3670 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