Upstream update

2017-07-26 21:12:40 -04:00
parent b7336e0204
commit 4265551308
17 changed files with 76 additions and 27 deletions
--- a/Spigot-Server-Patches/Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/Further-improve-server-tick-loop.patch
@@ -147,7 +147,7 @@ index 024218a1d..9d2f3b834 100644
                     }
                     lastTick = curTime;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e2e57084c..1b27ee67b 100644
+index d3639ad55..8f7ccf35a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {