OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 04:02:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
server.properties. Fixes BUKKIT-2657
This commit is contained in:
EvilSeph 2012-10-28 01:30:09 -04:00
parent 5fe8523023
commit 784f9e31a8
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/net/minecraft/server/DedicatedServer.java
View file

@ -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();
}

11
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -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) {

1
src/main/resources/configurations/bukkit.yml
View file

@ -16,7 +16,6 @@
settings:
allow-end: true
warn-on-overload: true
spawn-radius: 16
permissions-file: permissions.yml
update-folder: update
ping-packet-limit: 100