Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-05-15 11:25:20 -05:00
parent b75e22ccb2
commit f7d8aa4188
26 changed files with 61 additions and 58 deletions

View File

@@ -118,7 +118,7 @@ index b87273aca..c6cf7754b 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 a7fb58a9e..9cb05e067 100644
index f849a8148..63154b647 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 {