SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot
2011-06-17 04:49:58 +01:00
parent fd043a8342
commit f251e14478
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@@ -95,7 +95,9 @@ public final class CraftServer implements Server {
configuration.getString("database.password", "walrus"); configuration.getString("database.password", "walrus");
configuration.getString("database.driver", "org.sqlite.JDBC"); configuration.getString("database.driver", "org.sqlite.JDBC");
configuration.getString("database.isolation", "SERIALIZABLE"); configuration.getString("database.isolation", "SERIALIZABLE");
configuration.getString("settings.update-folder", "update"); configuration.getString("settings.update-folder", "update");
configuration.getInt("settings.spawn-radius", 16);
if (configuration.getNode("aliases") == null) { if (configuration.getNode("aliases") == null) {
configuration.setProperty("aliases.icanhasbukkit", "version"); configuration.setProperty("aliases.icanhasbukkit", "version");
@@ -553,4 +555,13 @@ public final class CraftServer implements Server {
return result; return result;
} }
public int getSpawnRadius() {
return configuration.getInt("settings.spawn-radius", 16);
}
public void setSpawnRadius(int value) {
configuration.setProperty("settings.spawn-radius", value);
configuration.save();
}
} }

3
paper-server/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
View File

@@ -23,6 +23,7 @@ import net.minecraft.server.Item;
import net.minecraft.server.ItemStack; import net.minecraft.server.ItemStack;
import net.minecraft.server.World; import net.minecraft.server.World;
import net.minecraft.server.WorldServer; import net.minecraft.server.WorldServer;
import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@@ -50,7 +51,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
public class CraftEventFactory { public class CraftEventFactory {
private static boolean canBuild(CraftWorld world, Player player, int x, int z) { private static boolean canBuild(CraftWorld world, Player player, int x, int z) {
WorldServer worldServer = world.getHandle(); WorldServer worldServer = world.getHandle();
int spawnSize = worldServer.server.spawnProtection; int spawnSize = Bukkit.getServer().getSpawnRadius();
if (spawnSize <= 0) return true; if (spawnSize <= 0) return true;
if (player.isOp()) return true; if (player.isOp()) return true;