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

@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
This will remove metadata on reload so it does not crash everything if a plugin uses it.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 43348d56c..c48e5f12c 100644
index 832e473ac..90e94c55b 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 {