Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-05-15 11:25:20 -05:00
parent b75e22ccb2
commit f7d8aa4188
26 changed files with 61 additions and 58 deletions

View File

@@ -48,7 +48,7 @@ index 63ea04fb4..65ab76cc5 100644
} else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
// Do nothing, this is coming from a plugin
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e5dcd4094..374956d5e 100644
index 637882f1f..ac7890a56 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 {