Upstream update

This commit is contained in:
Aikar
2017-08-07 23:05:16 -04:00
parent 96911e196f
commit 64b2b87256
24 changed files with 32 additions and 60 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f28471901..7c2bb6d01 100644
index 29aa11372..4ed92a652 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 {