Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-05-04 18:08:52 -05:00
parent d3f692b39b
commit 26d7646a75
23 changed files with 25 additions and 92 deletions

View File

@@ -18,7 +18,7 @@ index 4b3816465..14431b8ad 100644
this.die();
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 4d252aa47..7e4982d93 100644
index d77eefd6f..999e38878 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -0,0 +0,0 @@ import org.bukkit.entity.Player;