Update upstream

This commit is contained in:
Aikar
2018-07-25 19:05:07 -04:00
parent 10ed7dc6b4
commit 8536a71daa
49 changed files with 148 additions and 148 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 ff966de55..3f51eb384 100644
index 030d68a704..83364efb50 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 {