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-thunder.patch
+++ b/Spigot-Server-Patches/Disable-thunder.patch
@@ -19,7 +19,7 @@ index 2217f680c..a40d4887c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6856aac64..1432c6c85 100644
+index ce8fe791d..e52b14792 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 {