Update upstream B/CB/S

Closes GH-658
This commit is contained in:
Zach Brown
2017-04-16 17:12:01 -05:00
parent 9aba83bfdc
commit 515506c3ce
7 changed files with 38 additions and 38 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
https://github.com/PaperMC/Paper/issues/49
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e2afd9d93..40091231e 100644
index 9df6c0eb..e77307c3 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 {