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

@@ -43,7 +43,7 @@ index 536534d2e..bf7aaebd6 100644
entityplayer.getBukkitEntity().setVelocity(velocity);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c14100ac6..6a43f5674 100644
index 9b9e02ae1..18a481f2f 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 {