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

@@ -48,7 +48,7 @@ index ee11691bf..4ad75468c 100644
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 95b12331e..4d252aa47 100644
index 8158c4801..d77eefd6f 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 {