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

@@ -33,7 +33,7 @@ index b943a9b20..8f3b93dc1 100644
} else {
String[] astring1 = astring;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 04b4f7251..af3e1a7ac 100644
index 76ee8a394..49444274f 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 {