Update CB

This commit is contained in:
Shane Freeder
2017-08-16 16:47:06 +01:00
parent 7a4c06e567
commit 7fc4d26c3f
9 changed files with 24 additions and 26 deletions

View File

@@ -1399,10 +1399,10 @@ index ec98b3a02..63bbcf0b1 100644
@Override
public YamlConfiguration getConfig()
{
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {
return org.spigotmc.SpigotConfig.config;
}
@Override
+ @Override
+ public YamlConfiguration getBukkitConfig()
+ {
+ return configuration;
@@ -1420,10 +1420,9 @@ index ec98b3a02..63bbcf0b1 100644
+ return com.destroystokyo.paper.PaperConfig.config;
+ }
+
+ @Override
@Override
public void restart() {
org.spigotmc.RestartCommand.restart();
}
diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
deleted file mode 100644
index 311a2c3f6..000000000