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

@@ -30,7 +30,7 @@ index 3898ad8fa..2f6e169f5 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b4cecab30..2d78acf04 100644
index 00208ff45..2fc92f308 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 {