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

@@ -86,7 +86,7 @@ index 6fbc84559..a8b9d9263 100644
if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
this.e(movingobjectposition.a());
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 7e4982d93..a850a9634 100644
index 999e38878..e669f0878 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 {