twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-11 02:02:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Moved spawn-protection from server.properties into (settings.)spawn-radius in bukkit.yml

Browse Source
This commit is contained in:
Dinnerbone
2011-06-17 04:49:58 +01:00
parent c0244eda04
commit 7aadc3d666
6 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@@ -50,7 +50,6 @@ public class MinecraftServer implements Runnable, ICommandListener {
public boolean o;
// CraftBukkit start
public int spawnProtection;
public List<WorldServer> worlds = new ArrayList<WorldServer>();
public CraftServer server;
public OptionSet options;
@@ -100,7 +99,6 @@ public class MinecraftServer implements Runnable, ICommandListener {
this.spawnAnimals = this.propertyManager.getBoolean("spawn-animals", true);
this.pvpMode = this.propertyManager.getBoolean("pvp", true);
this.o = this.propertyManager.getBoolean("allow-flight", false);
this.spawnProtection = this.propertyManager.getInt("spawn-protection", 16); // CraftBukkit - Configurable spawn protection start
InetAddress inetaddress = null;
if (s.length() > 0) {
@@ -149,8 +147,13 @@ public class MinecraftServer implements Runnable, ICommandListener {
long elapsed = System.nanoTime() - j;
String time = String.format("%.3fs", elapsed / 10000000000.0D);
log.info("Done (" + time + ")! For help, type \"help\" or \"?\"");
// CraftBukkit end
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.");
server.setSpawnRadius(this.propertyManager.getInt("spawn-protection", 16));
this.propertyManager.properties.remove("spawn-protection");
this.propertyManager.b();
}
return true;
}