Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-06-12 22:28:09 -05:00
parent 29bba5da9c
commit 964e06c9a5
6 changed files with 6 additions and 6 deletions

View File

@@ -118,7 +118,7 @@ index ab3d6e484..2695cff93 100644
flag = true;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index ce773218c..c39281247 100644
index dc6a6b37b..d12278a52 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {