Remove spawn-radius setting in bukkit.yml in favour of spawn-protection in

server.properties. Fixes BUKKIT-2657

1 files changed, 10 insertions, 1 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 24b20f12..2cd7d0d1 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -920,8 +920,17 @@ public final class CraftServer implements Server {
         return result;
     }
 
+    public void removeBukkitSpawnRadius() {
+        configuration.set("settings.spawn-radius", null);
+        saveConfig();
+    }
+
+    public int getBukkitSpawnRadius() {
+        return configuration.getInt("settings.spawn-radius", -1);
+    }
+
     public int getSpawnRadius() {
-        return configuration.getInt("settings.spawn-radius", 16);
+        return ((DedicatedServer) console).propertyManager.getInt("spawn-protection", 16);
     }
 
     public void setSpawnRadius(int value) {