Update upstream CB/S

2017-06-11 12:03:07 -05:00
parent 3b5e6cd48f
commit e3dd2d2df2
14 changed files with 33 additions and 63 deletions
--- a/Spigot-Server-Patches/Disable-ice-and-snow.patch
+++ b/Spigot-Server-Patches/Disable-ice-and-snow.patch
@@ -19,7 +19,7 @@ index a40d4887c..4fea4b359 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 1432c6c85..04eb5ad9a 100644
+index e52b14792..bb07b1d66 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {