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

@@ -78,7 +78,7 @@ index 2fa63a27f..7af76e14c 100644
this.getServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index a850a9634..59942d9cb 100644
index e669f0878..afdd4ab70 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 @@ public class CraftEventFactory {