From 784f9e31a8bb21adb6b354b8c05225bbac06dbb6 Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Sun, 28 Oct 2012 01:30:09 -0400 Subject: Remove spawn-radius setting in bukkit.yml in favour of spawn-protection in server.properties. Fixes BUKKIT-2657 --- src/main/java/net/minecraft/server/DedicatedServer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/net/minecraft') diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java index 5121cd61..0c748614 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -157,10 +157,11 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer } // CraftBukkit start - if (this.propertyManager.properties.containsKey("spawn-protection")) { - log.info("'spawn-protection' in server.properties has been moved to 'settings.spawn-radius' in bukkit.yml. I will move your config for you."); - this.server.setSpawnRadius(this.propertyManager.getInt("spawn-protection", 16)); + if (this.server.getBukkitSpawnRadius() > -1) { + log.info("'settings.spawn-radius' in bukkit.yml has been moved to 'spawn-protection' in server.properties. I will move your config for you."); this.propertyManager.properties.remove("spawn-protection"); + this.propertyManager.getInt("spawn-protection", this.server.getBukkitSpawnRadius()); + this.server.removeBukkitSpawnRadius(); this.propertyManager.savePropertiesFile(); } -- cgit v1.2.3