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

@@ -26,7 +26,7 @@ index 175753c5a..16ec67569 100644
this.lastLevelCost = this.levelCost;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a9186b77a..1269a02aa 100644
index 7ee17b254..f83b16bcd 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 {