Update upstream B/S

This commit is contained in:
Zach Brown
2017-05-23 17:11:28 -05:00
parent b39f2133a1
commit 16113437c6
20 changed files with 26 additions and 26 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 488c58755..a1f0ef672 100644
index a7dd7988e..4d8414369 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 {