Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-12-27 22:45:33 -06:00
parent a6be0047d7
commit fa8db475d6
23 changed files with 99 additions and 99 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
Reload the aliases stored in commands.yml
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1bc394ada..15d572489 100644
index 54f0a1d6..f4eef421 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 {