2013-06-15 12:01:15 +00:00
From 409e7ab18c0ad7edb1b5f5a401a4398df325075d Mon Sep 17 00:00:00 2001
2013-01-22 04:58:34 +00:00
From: md_5 <md_5@live.com.au>
2013-06-11 04:02:19 +00:00
Date: Tue, 11 Jun 2013 13:55:57 +1000
2013-03-22 23:08:09 +00:00
Subject: [PATCH] Spigot Changes
2013-01-15 01:18:40 +00:00
diff --git a/.gitignore b/.gitignore
2013-03-22 22:31:28 +00:00
index c3faf57..346b232 100644
2013-01-15 01:18:40 +00:00
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,5 @@
/src/main/resources/achievement
/src/main/resources/lang
+
+/dependency-reduced-pom.xml
2013-01-22 04:58:34 +00:00
\ No newline at end of file
2013-01-15 01:18:40 +00:00
diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
2013-03-15 21:35:56 +00:00
index 4392cb2..8e041c2 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/Block.java
+++ b/src/main/java/net/minecraft/server/Block.java
2013-03-15 21:35:56 +00:00
@@ -768,4 +768,16 @@ public class Block {
2013-01-15 01:18:40 +00:00
return 0;
}
// CraftBukkit end
+
+ // Spigot start
+ public static float range(float min, float value, float max) {
+ if (value < min) {
+ return min;
+ }
+ if (value > max) {
+ return max;
+ }
+ return value;
+ }
+ // Spigot end
}
diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java
2013-03-22 23:08:09 +00:00
index 83cc09d..eed8ded 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/BlockCactus.java
+++ b/src/main/java/net/minecraft/server/BlockCactus.java
@@ -23,7 +23,7 @@ public class BlockCactus extends Block {
if (l < 3) {
int i1 = world.getData(i, j, k);
- if (i1 == 15) {
2013-03-22 23:08:09 +00:00
+ if (i1 >= (byte) range(3, (world.growthOdds / world.getWorld().cactusGrowthModifier * 15) + 0.5F, 15)) { // Spigot
2013-01-15 01:18:40 +00:00
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j + 1, k, this.id, 0); // CraftBukkit
2013-03-15 21:35:56 +00:00
world.setData(i, j, k, 0, 4);
this.doPhysics(world, i, j + 1, k, this.id);
2013-01-15 01:18:40 +00:00
diff --git a/src/main/java/net/minecraft/server/BlockCrops.java b/src/main/java/net/minecraft/server/BlockCrops.java
2013-03-22 23:08:09 +00:00
index 14a1c3b..0aee7af 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/BlockCrops.java
+++ b/src/main/java/net/minecraft/server/BlockCrops.java
2013-03-15 21:35:56 +00:00
@@ -28,7 +28,7 @@ public class BlockCrops extends BlockFlower {
2013-01-15 01:18:40 +00:00
if (l < 7) {
2013-03-15 21:35:56 +00:00
float f = this.k(world, i, j, k);
2013-01-15 01:18:40 +00:00
- if (random.nextInt((int) (25.0F / f) + 1) == 0) {
2013-03-22 23:08:09 +00:00
+ if (random.nextInt((int) (world.growthOdds / world.getWorld().wheatGrowthModifier * (25.0F / f)) + 1) == 0) { // Spigot
2013-01-15 01:18:40 +00:00
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this.id, ++l); // CraftBukkit
}
}
diff --git a/src/main/java/net/minecraft/server/BlockGrass.java b/src/main/java/net/minecraft/server/BlockGrass.java
2013-03-22 23:08:09 +00:00
index 6f9301d..2ccc0b8 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/BlockGrass.java
+++ b/src/main/java/net/minecraft/server/BlockGrass.java
2013-03-22 23:08:09 +00:00
@@ -32,7 +32,8 @@ public class BlockGrass extends Block {
2013-01-15 01:18:40 +00:00
}
// CraftBukkit end
} else if (world.getLightLevel(i, j + 1, k) >= 9) {
- for (int l = 0; l < 4; ++l) {
2013-03-22 23:08:09 +00:00
+ int numGrowth = Math.min(4, Math.max(20, (int) (4 * 100F / world.growthOdds))); // Spigot
+ for (int l = 0; l < numGrowth; ++l) { // Spigot
2013-01-15 01:18:40 +00:00
int i1 = i + random.nextInt(3) - 1;
int j1 = j + random.nextInt(5) - 3;
int k1 = k + random.nextInt(3) - 1;
diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java
2013-03-22 23:08:09 +00:00
index 872ad00..6e135a4 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/BlockMushroom.java
+++ b/src/main/java/net/minecraft/server/BlockMushroom.java
2013-03-15 21:35:56 +00:00
@@ -27,7 +27,7 @@ public class BlockMushroom extends BlockFlower {
2013-01-15 01:18:40 +00:00
2013-03-15 21:35:56 +00:00
public void a(World world, int i, int j, int k, Random random) {
2013-01-27 22:46:19 +00:00
final int sourceX = i, sourceY = j, sourceZ = k; // CraftBukkit
2013-01-15 01:18:40 +00:00
- if (random.nextInt(25) == 0) {
2013-03-22 23:08:09 +00:00
+ if (random.nextInt(Math.max(1, (int) world.growthOdds / world.getWorld().mushroomGrowthModifier * 25)) == 0) { // Spigot
2013-01-15 01:18:40 +00:00
byte b0 = 4;
int l = 5;
diff --git a/src/main/java/net/minecraft/server/BlockMycel.java b/src/main/java/net/minecraft/server/BlockMycel.java
2013-03-22 23:08:09 +00:00
index 1de8c83..fa11d1c 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/BlockMycel.java
+++ b/src/main/java/net/minecraft/server/BlockMycel.java
2013-03-22 23:08:09 +00:00
@@ -32,7 +32,8 @@ public class BlockMycel extends Block {
2013-01-15 01:18:40 +00:00
}
// CraftBukkit end
} else if (world.getLightLevel(i, j + 1, k) >= 9) {
- for (int l = 0; l < 4; ++l) {
2013-03-22 23:08:09 +00:00
+ int numGrowth = Math.min(4, Math.max(20, (int) (4 * 100F / world.growthOdds))); // Spigot
+ for (int l = 0; l < numGrowth; ++l) { // Spigot
2013-01-15 01:18:40 +00:00
int i1 = i + random.nextInt(3) - 1;
int j1 = j + random.nextInt(5) - 3;
int k1 = k + random.nextInt(3) - 1;
diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java
2013-03-22 23:08:09 +00:00
index 8657860..50c5200 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/BlockReed.java
+++ b/src/main/java/net/minecraft/server/BlockReed.java
2013-03-15 21:35:56 +00:00
@@ -23,7 +23,7 @@ public class BlockReed extends Block {
2013-01-15 01:18:40 +00:00
if (l < 3) {
int i1 = world.getData(i, j, k);
- if (i1 == 15) {
2013-03-22 23:08:09 +00:00
+ if (i1 >= (byte) range(3, (world.growthOdds / world.getWorld().sugarGrowthModifier * 15) + 0.5F, 15)) { // Spigot
2013-01-15 01:18:40 +00:00
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j + 1, k, this.id, 0); // CraftBukkit
2013-03-15 21:35:56 +00:00
world.setData(i, j, k, 0, 4);
2013-01-15 01:18:40 +00:00
} else {
diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java
2013-03-25 07:57:00 +00:00
index 3b00939..4ab0fb9 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/BlockSapling.java
+++ b/src/main/java/net/minecraft/server/BlockSapling.java
2013-03-25 07:57:00 +00:00
@@ -26,7 +26,7 @@ public class BlockSapling extends BlockFlower {
2013-03-15 21:35:56 +00:00
public void a(World world, int i, int j, int k, Random random) {
if (!world.isStatic) {
super.a(world, i, j, k, random);
- if (world.getLightLevel(i, j + 1, k) >= 9 && random.nextInt(7) == 0) {
2013-03-23 01:44:28 +00:00
+ if (world.getLightLevel(i, j + 1, k) >= 9 && (random.nextInt(Math.max(2, (int) ((world.growthOdds / world.getWorld().aggregateTicks / world.getWorld().treeGrowthModifier * 7) + 0.5F))) == 0)) { // Spigot
2013-03-15 21:35:56 +00:00
this.grow(world, i, j, k, random, false, null, null); // CraftBukkit - added bonemeal, player and itemstack
}
}
2013-01-15 01:18:40 +00:00
diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
2013-03-22 23:08:09 +00:00
index 8339a35..c17ce36 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/BlockStem.java
+++ b/src/main/java/net/minecraft/server/BlockStem.java
@@ -27,7 +27,7 @@ public class BlockStem extends BlockFlower {
if (world.getLightLevel(i, j + 1, k) >= 9) {
2013-03-15 21:35:56 +00:00
float f = this.m(world, i, j, k);
2013-01-15 01:18:40 +00:00
- if (random.nextInt((int) (25.0F / f) + 1) == 0) {
2013-03-22 23:08:09 +00:00
+ if (random.nextInt((int) (world.growthOdds / (this.id == Block.PUMPKIN_STEM.id ? world.getWorld().pumpkinGrowthModifier : world.getWorld().melonGrowthModifier) * (25.0F / f)) + 1) == 0) { // Spigot
2013-01-15 01:18:40 +00:00
int l = world.getData(i, j, k);
if (l < 7) {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
2013-06-15 12:01:15 +00:00
index 018c314..f6885d6 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
2013-06-04 07:44:12 +00:00
@@ -845,8 +845,20 @@ public class PlayerConnection extends Connection {
2013-01-15 01:18:40 +00:00
this.chat(s, packet3chat.a_());
+ // Spigot start
+ boolean isCounted = true;
+ if (server.spamGuardExclusions != null) {
+ for (String excluded : server.spamGuardExclusions) {
+ if (s.startsWith(excluded)) {
+ isCounted = false;
+ break;
+ }
+ }
+ }
// This section stays because it is only applicable to packets
- if (chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.name)) { // CraftBukkit use thread-safe spam
+ if (isCounted && chatSpamField.addAndGet(this, 20) > 200 && !this.minecraftServer.getPlayerList().isOp(this.player.name)) { // CraftBukkit use thread-safe spam
+ // Spigot end
2013-03-25 07:57:00 +00:00
+ // CraftBukkit start
2013-01-15 01:18:40 +00:00
if (packet3chat.a_()) {
Waitable waitable = new Waitable() {
2013-03-25 07:57:00 +00:00
@Override
2013-06-04 07:44:12 +00:00
@@ -967,7 +979,7 @@ public class PlayerConnection extends Connection {
2013-01-15 01:18:40 +00:00
}
try {
2013-03-15 21:35:56 +00:00
- this.minecraftServer.getLogger().info(event.getPlayer().getName() + " issued server command: " + event.getMessage()); // CraftBukkit
+ if (server.logCommands) this.minecraftServer.getLogger().info(event.getPlayer().getName() + " issued server command: " + event.getMessage()); // Spigot
2013-01-15 01:18:40 +00:00
if (this.server.dispatchCommand(event.getPlayer(), event.getMessage().substring(1))) {
return;
}
2013-06-07 23:20:25 +00:00
@@ -1554,8 +1566,9 @@ public class PlayerConnection extends Connection {
2013-01-15 01:18:40 +00:00
flag = false;
} else {
for (i = 0; i < packet130updatesign.lines[j].length(); ++i) {
- if (SharedConstants.allowedCharacters.indexOf(packet130updatesign.lines[j].charAt(i)) < 0) {
+ if (!SharedConstants.isAllowedChatCharacter(packet130updatesign.lines[j].charAt(i))) {
flag = false;
+ break;
}
}
}
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
2013-06-11 01:54:45 +00:00
index b7e327b..0e3a6a1 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
2013-05-03 23:24:15 +00:00
@@ -307,7 +307,7 @@ public abstract class PlayerList {
2013-01-15 01:18:40 +00:00
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, s1);
} else if (!this.isWhitelisted(s)) {
- event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, "You are not white-listed on this server!");
+ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, cserver.whitelistMessage); // Spigot
} else {
String s2 = socketaddress.toString();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
2013-06-11 03:14:01 +00:00
index 6c3fcf1..4a8d3f4 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
2013-06-11 03:14:01 +00:00
@@ -37,6 +37,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
private static final StructurePieceTreasure[] S = new StructurePieceTreasure[] { new StructurePieceTreasure(Item.STICK.id, 0, 1, 3, 10), new StructurePieceTreasure(Block.WOOD.id, 0, 1, 3, 10), new StructurePieceTreasure(Block.LOG.id, 0, 1, 3, 10), new StructurePieceTreasure(Item.STONE_AXE.id, 0, 1, 1, 3), new StructurePieceTreasure(Item.WOOD_AXE.id, 0, 1, 1, 5), new StructurePieceTreasure(Item.STONE_PICKAXE.id, 0, 1, 1, 3), new StructurePieceTreasure(Item.WOOD_PICKAXE.id, 0, 1, 1, 5), new StructurePieceTreasure(Item.APPLE.id, 0, 2, 3, 5), new StructurePieceTreasure(Item.BREAD.id, 0, 2, 3, 3)};
private ArrayList T = new ArrayList();
private IntHashMap entitiesById;
+ private int aggregateTicks = 1; // Spigot
// CraftBukkit start
public final int dimension;
@@ -295,6 +296,10 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
2013-01-15 01:18:40 +00:00
}
protected void g() {
2013-03-15 23:11:01 +00:00
+ // Spigot start
2013-06-11 03:14:01 +00:00
+ if (--this.aggregateTicks != 0) return;
2013-01-15 01:18:40 +00:00
+ aggregateTicks = this.getWorld().aggregateTicks;
+ // Spigot end
super.g();
int i = 0;
int j = 0;
2013-06-11 03:14:01 +00:00
@@ -412,7 +417,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
2013-01-15 01:18:40 +00:00
if (block != null && block.isTicking()) {
++i;
2013-06-11 03:14:01 +00:00
this.growthOdds = (iter.value() < 1) ? this.modifiedOdds : 100; // Spigot - grow fast if no players are in this chunk (value = player count)
2013-04-30 22:33:27 +00:00
- block.a(this, k2 + k, i3 + chunksection.getYPosition(), l2 + l, this.random);
2013-06-11 03:14:01 +00:00
+ for ( int c = 0; c < ( ( block.id == Block.SAPLING.id ) ? 1 : getWorld().aggregateTicks ); c++ ) block.a(this, k2 + k, i3 + chunksection.getYPosition(), l2 + l, this.random);
2013-01-15 01:18:40 +00:00
}
}
2013-03-15 21:35:56 +00:00
}
2013-01-15 01:18:40 +00:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2013-06-11 04:02:19 +00:00
index 2956e75..c234cac 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2013-04-23 01:27:55 +00:00
@@ -166,6 +166,13 @@ public final class CraftServer implements Server {
2013-01-15 01:18:40 +00:00
private final class BooleanWrapper {
private boolean value = true;
}
+ // Spigot start
+ public String whitelistMessage = "You are not white-listed on this server!";
+ public String stopMessage = "Server restarting. Brb";
+ public boolean logCommands = true;
+ public boolean commandComplete = true;
+ public List<String> spamGuardExclusions;
+ // Spigot end
static {
ConfigurationSerialization.registerClass(CraftOfflinePlayer.class);
2013-04-23 01:27:55 +00:00
@@ -208,12 +215,20 @@ public final class CraftServer implements Server {
2013-01-15 01:18:40 +00:00
chunkGCLoadThresh = configuration.getInt("chunk-gc.load-threshold");
updater = new AutoUpdater(new BukkitDLUpdaterService(configuration.getString("auto-updater.host")), getLogger(), configuration.getString("auto-updater.preferred-channel"));
- updater.setEnabled(configuration.getBoolean("auto-updater.enabled"));
+ updater.setEnabled(false);
updater.setSuggestChannels(configuration.getBoolean("auto-updater.suggest-channels"));
updater.getOnBroken().addAll(configuration.getStringList("auto-updater.on-broken"));
updater.getOnUpdate().addAll(configuration.getStringList("auto-updater.on-update"));
updater.check(serverVersion);
+ // Spigot start
2013-01-22 02:46:53 +00:00
+ Spigot.initialize(this, commandMap, configuration);
2013-01-15 01:18:40 +00:00
+
+ try {
+ configuration.save(getConfigFile());
+ } catch (IOException e) {
+ }
+ // Spigot end
loadPlugins();
enablePlugins(PluginLoadOrder.STARTUP);
}
2013-04-23 01:27:55 +00:00
@@ -535,6 +550,7 @@ public final class CraftServer implements Server {
2013-01-22 02:46:53 +00:00
((DedicatedServer) console).propertyManager = config;
+ ((SimplePluginManager) pluginManager).useTimings(configuration.getBoolean("settings.plugin-profiling")); // Spigot
boolean animals = config.getBoolean("spawn-animals", console.getSpawnAnimals());
boolean monsters = config.getBoolean("spawn-monsters", console.worlds.get(0).difficulty > 0);
int difficulty = config.getInt("difficulty", console.worlds.get(0).difficulty);
2013-04-23 01:27:55 +00:00
@@ -600,6 +616,7 @@ public final class CraftServer implements Server {
2013-01-22 02:46:53 +00:00
"This plugin is not properly shutting down its async tasks when it is being reloaded. This may cause conflicts with the newly loaded version of the plugin"
));
}
+ Spigot.initialize(this, commandMap, configuration); // Spigot
loadPlugins();
enablePlugins(PluginLoadOrder.STARTUP);
enablePlugins(PluginLoadOrder.POSTWORLD);
2013-06-11 04:02:19 +00:00
@@ -1326,7 +1343,7 @@ public final class CraftServer implements Server {
2013-01-15 01:18:40 +00:00
public List<String> tabCompleteCommand(Player player, String message) {
List<String> completions = null;
try {
- completions = getCommandMap().tabComplete(player, message.substring(1));
+ completions = (commandComplete) ? getCommandMap().tabComplete(player, message.substring(1)) : null; // Spigot
} catch (CommandException ex) {
player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2013-06-15 12:01:15 +00:00
index a9b4e71..9789ba4 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2013-06-11 03:14:01 +00:00
@@ -69,6 +69,17 @@ public class CraftWorld implements World {
private static final Random rand = new Random();
// Spigot start
public int growthPerTick = 650;
2013-01-15 01:18:40 +00:00
+ public boolean randomLightingUpdates = false;
+ public int mobSpawnRange = 4;
+ public int aggregateTicks = 4;
2013-06-11 03:14:01 +00:00
+ // Crop growth rates:
2013-01-15 01:18:40 +00:00
+ public int wheatGrowthModifier = 100;
+ public int cactusGrowthModifier = 100;
+ public int melonGrowthModifier = 100;
+ public int pumpkinGrowthModifier = 100;
+ public int sugarGrowthModifier = 100;
+ public int treeGrowthModifier = 100;
+ public int mushroomGrowthModifier = 100;
2013-06-11 03:14:01 +00:00
// Spigot end
2013-06-15 12:01:15 +00:00
// Spigot start
@@ -93,16 +104,46 @@ public class CraftWorld implements World {
2013-06-11 03:14:01 +00:00
// Load defaults first
boolean info = configuration.getBoolean( "world-settings.default.info", true );
growthPerTick = configuration.getInt( "world-settings.default.growth-chunks-per-tick", growthPerTick );
+ randomLightingUpdates = configuration.getBoolean( "world-settings.default.random-light-updates", randomLightingUpdates );
+ mobSpawnRange = configuration.getInt( "world-settings.default.mob-spawn-range", mobSpawnRange );
+ aggregateTicks = Math.max( 1, configuration.getInt( "world-settings.default.aggregate-chunkticks", aggregateTicks ) );
+ wheatGrowthModifier = configuration.getInt( "world-settings.default.wheat-growth-modifier", wheatGrowthModifier );
+ cactusGrowthModifier = configuration.getInt( "world-settings.default.cactus-growth-modifier", cactusGrowthModifier );
+ melonGrowthModifier = configuration.getInt( "world-settings.default.melon-growth-modifier", melonGrowthModifier );
+ pumpkinGrowthModifier = configuration.getInt( "world-settings.default.pumpkin-growth-modifier", pumpkinGrowthModifier );
+ sugarGrowthModifier = configuration.getInt( "world-settings.default.sugar-growth-modifier", sugarGrowthModifier );
+ treeGrowthModifier = configuration.getInt( "world-settings.default.tree-growth-modifier", treeGrowthModifier );
+ mushroomGrowthModifier = configuration.getInt( "world-settings.default.mushroom-growth-modifier", mushroomGrowthModifier );
// Override defaults with world specific, if they exist
info = configuration.getBoolean( "world-settings." + name + ".info", info );
growthPerTick = configuration.getInt( "world-settings." + name + ".growth-chunks-per-tick", growthPerTick );
+ randomLightingUpdates = configuration.getBoolean( "world-settings." + name + ".random-light-updates", randomLightingUpdates );
+ mobSpawnRange = configuration.getInt( "world-settings." + name + ".mob-spawn-range", mobSpawnRange );
+ aggregateTicks = Math.max( 1, configuration.getInt( "world-settings." + name + ".aggregate-chunkticks", aggregateTicks ) );
+ wheatGrowthModifier = configuration.getInt( "world-settings." + name + ".wheat-growth-modifier", wheatGrowthModifier );
+ cactusGrowthModifier = configuration.getInt( "world-settings." + name + ".cactus-growth-modifier", cactusGrowthModifier );
+ melonGrowthModifier = configuration.getInt( "world-settings." + name + ".melon-growth-modifier", melonGrowthModifier );
+ pumpkinGrowthModifier = configuration.getInt( "world-settings." + name + ".pumpkin-growth-modifier", pumpkinGrowthModifier );
+ sugarGrowthModifier = configuration.getInt( "world-settings." + name + ".sugar-growth-modifier", sugarGrowthModifier );
+ treeGrowthModifier = configuration.getInt( "world-settings." + name + ".tree-growth-modifier", treeGrowthModifier );
+ mushroomGrowthModifier = configuration.getInt( "world-settings." + name + ".mushroom-growth-modifier", mushroomGrowthModifier );
if ( info )
{
server.getLogger().info( "-------------- Spigot ----------------" );
server.getLogger().info( "-------- World Settings For [" + name + "] --------" );
server.getLogger().info( "Growth Per Tick: " + growthPerTick );
+ server.getLogger().info( "Random Lighting Updates: " + randomLightingUpdates );
+ server.getLogger().info( "Mob Spawn Range: " + mobSpawnRange );
+ server.getLogger().info( "Aggregate Ticks: " + aggregateTicks );
+ server.getLogger().info( "Wheat Growth Modifier: " + wheatGrowthModifier );
+ server.getLogger().info( "Cactus Growth Modifier: " + cactusGrowthModifier );
+ server.getLogger().info( "Melon Growth Modifier: " + melonGrowthModifier );
+ server.getLogger().info( "Pumpkin Growth Modifier: " + pumpkinGrowthModifier );
+ server.getLogger().info( "Sugar Growth Modifier: " + sugarGrowthModifier );
+ server.getLogger().info( "Tree Growth Modifier: " + treeGrowthModifier );
+ server.getLogger().info( "Mushroom Growth Modifier: " + mushroomGrowthModifier );
server.getLogger().info( "-------------------------------------------------" );
}
// Spigot end
2013-01-22 02:46:53 +00:00
diff --git a/src/main/java/org/bukkit/craftbukkit/Spigot.java b/src/main/java/org/bukkit/craftbukkit/Spigot.java
new file mode 100644
2013-04-23 01:27:55 +00:00
index 0000000..2cd806e
2013-01-22 02:46:53 +00:00
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/Spigot.java
2013-04-23 01:27:55 +00:00
@@ -0,0 +1,19 @@
2013-01-22 02:46:53 +00:00
+package org.bukkit.craftbukkit;
+
+import org.bukkit.command.SimpleCommandMap;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+public class Spigot {
+
2013-02-23 00:50:29 +00:00
+ public static void initialize(CraftServer server, SimpleCommandMap commandMap, YamlConfiguration configuration) {
2013-01-22 02:46:53 +00:00
+ server.whitelistMessage = configuration.getString("settings.whitelist-message", server.whitelistMessage);
+ server.stopMessage = configuration.getString("settings.stop-message", server.stopMessage);
+ server.logCommands = configuration.getBoolean("settings.log-commands", true);
+ server.commandComplete = configuration.getBoolean("settings.command-complete", true);
+ server.spamGuardExclusions = configuration.getStringList("settings.spam-exclusions");
+
2013-01-22 03:53:50 +00:00
+ if (server.chunkGCPeriod == 0) {
2013-02-22 08:11:59 +00:00
+ server.getLogger().severe("[Spigot] You should not disable chunk-gc, unexpected behaviour may occur!");
2013-01-22 03:53:50 +00:00
+ }
2013-01-22 02:46:53 +00:00
+ }
+}
2013-01-15 01:18:40 +00:00
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
2013-03-25 07:57:00 +00:00
index c896ba2..e99cb22 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
@@ -40,7 +40,7 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu
// See if someone already loaded this chunk while we were working on it (API, etc)
if (queuedChunk.provider.chunks.containsKey(queuedChunk.coords)) {
// Make sure it isn't queued for unload, we need it
- queuedChunk.provider.unloadQueue.remove(queuedChunk.coords);
+ queuedChunk.provider.unloadQueue.remove(x, z);
return;
}
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
2013-06-11 02:10:31 +00:00
index 61a95e3..67c6c5e 100644
2013-01-15 01:18:40 +00:00
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
2013-06-11 02:10:31 +00:00
@@ -25,6 +25,30 @@ settings:
2013-01-15 01:18:40 +00:00
query-plugins: true
deprecated-verbose: default
shutdown-message: Server closed
+ whitelist-message: You are not white-listed on this server!
+ log-commands: true
+ command-complete: true
+ spam-exclusions:
+ - /skill
+world-settings:
+ default:
+ growth-chunks-per-tick: 650
+ mob-spawn-range: 4
+ random-light-updates: false
+ aggregate-chunkticks: 4
+ wheat-growth-modifier: 100
+ cactus-growth-modifier: 100
+ melon-growth-modifier: 100
+ pumpkin-growth-modifier: 100
+ sugar-growth-modifier: 100
+ tree-growth-modifier: 100
+ mushroom-growth-modifier: 100
2013-03-23 09:15:20 +00:00
+ info: true
2013-01-15 01:18:40 +00:00
+ world:
+ growth-chunks-per-tick: 1000
+ world_nether:
+ growth-chunks-per-tick: 0
+ random-light-updates: true
spawn-limits:
monsters: 70
animals: 15
--
2013-06-02 05:15:15 +00:00
1.8.1.2
2013-01-15 01:18:40 +00:00