Upstream update

2017-08-07 23:05:16 -04:00
parent 96911e196f
commit 64b2b87256
24 changed files with 32 additions and 60 deletions
--- a/Spigot-Server-Patches/Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/Default-loading-permissions.yml-before-plugins.patch
@@ -30,7 +30,7 @@ index 3898ad8fa..2f6e169f5 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 491d6ef7c..d8b01145f 100644
+index 52a03a2c5..f178725b1 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 {