OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-03 13:36:44 +01:00
Code Issues Projects Releases Packages 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
Show stats 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;
}

2
src/main/java/net/minecraft/server/NetServerHandler.java
View file

@ -448,7 +448,7 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
if (packet14blockdig.e == 0) {
// CraftBukkit
if (i1 < this.minecraftServer.spawnProtection && !flag) {
if (i1 < server.getSpawnRadius() && !flag) {
this.player.netServerHandler.sendPacket(new Packet53BlockChange(i, j, k, worldserver));
} else {
// CraftBukkit - add face argument

2
src/main/java/net/minecraft/server/PropertyManager.java
View file

@ -12,7 +12,7 @@ import joptsimple.OptionSet; // CraftBukkit
public class PropertyManager {
public static Logger a = Logger.getLogger("Minecraft");
private Properties properties = new Properties();
public Properties properties = new Properties(); // Craftbukkit - priv to pub
private File c;
public PropertyManager(File file1) {

2
src/main/java/net/minecraft/server/WorldServer.java
View file

@ -99,7 +99,7 @@ public class WorldServer extends World implements BlockChangeDelegate {
}
// CraftBukkit - Configurable spawn protection
return i1 > this.server.spawnProtection || this.server.serverConfigurationManager.isOp(entityhuman.name);
return i1 > getServer().getSpawnRadius() || this.server.serverConfigurationManager.isOp(entityhuman.name);
}
protected void c(Entity entity) {

11
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.driver", "org.sqlite.JDBC");
configuration.getString("database.isolation", "SERIALIZABLE");
configuration.getString("settings.update-folder", "update");
configuration.getInt("settings.spawn-radius", 16);
if (configuration.getNode("aliases") == null) {
configuration.setProperty("aliases.icanhasbukkit", "version");
@ -553,4 +555,13 @@ public final class CraftServer implements Server {
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
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.World;
import net.minecraft.server.WorldServer;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.block.Block;
@ -50,7 +51,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
public class CraftEventFactory {
private static boolean canBuild(CraftWorld world, Player player, int x, int z) {
WorldServer worldServer = world.getHandle();
int spawnSize = worldServer.server.spawnProtection;
int spawnSize = Bukkit.getServer().getSpawnRadius();
if (spawnSize <= 0) return true;
if (player.isOp()) return true;