Update upstream B/CB

This commit is contained in:
Zach Brown
2018-07-13 02:39:44 -05:00
parent eb1140acce
commit c89e4105d2
20 changed files with 28 additions and 28 deletions

View File

@@ -203,7 +203,7 @@ index e4ed2e991..9627a9be0 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 44d0db180..b2b707305 100644
index e3ad45aa8..e6ff3fc97 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {