Update upstream CB/S

This commit is contained in:
Zach Brown
2017-06-11 12:03:07 -05:00
parent 3b5e6cd48f
commit e3dd2d2df2
14 changed files with 33 additions and 63 deletions

View File

@@ -25,7 +25,7 @@ index adc810720..e706efff5 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1cd81e533..b8719ba91 100644
index 3a61c67a1..2ca46b05b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
@@ -38,7 +38,7 @@ index 1cd81e533..b8719ba91 100644
this.getServer().getPluginManager().callEvent(event);
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 7d7f3d39e..36e6fdd16 100644
index 2e5e8a99f..e37847e6c 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ import org.bukkit.event.weather.LightningStrikeEvent;