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

Made the world info possible to turn off.

Browse Source 
By: totokaka <ttotokaka@gmail.com>
This commit is contained in:
Spigot
2013-03-23 20:15:20 +11:00
parent 4644626cff
commit 3eb3f9463d
7 changed files with 62 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0003-Merge-tweaks-and-configuration.patch
View File

@@ -1,4 +1,4 @@
From 9cfdf2543e6a7f7d485373d50496426132fbe161 Mon Sep 17 00:00:00 2001
From daf9b804fc18297c242cde1a7401e8c26f15e414 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Sat, 23 Mar 2013 09:46:33 +1100
Subject: [PATCH] Merge tweaks and configuration
@@ -75,10 +75,10 @@ index 2f8e066..0c378e7 100644
if (event != null && (event.isCancelled() || entity.dead)) {
entity.dead = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index b510748..9343d46 100644
index 150d581..a445d8f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -91,6 +91,8 @@ public class CraftWorld implements World {
@@ -92,6 +92,8 @@ public class CraftWorld implements World {
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));
@@ -87,7 +87,7 @@ index b510748..9343d46 100644
wheatGrowthModifier = configuration.getInt("world-settings.default.wheat-growth-modifier", wheatGrowthModifier);
cactusGrowthModifier = configuration.getInt("world-settings.default.cactus-growth-modifier", cactusGrowthModifier);
@@ -105,6 +107,8 @@ public class CraftWorld implements World {
@@ -107,6 +109,8 @@ public class CraftWorld implements World {
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));
@@ -96,7 +96,7 @@ index b510748..9343d46 100644
wheatGrowthModifier = configuration.getInt("world-settings." + name + ".wheat-growth-modifier", wheatGrowthModifier);
cactusGrowthModifier = configuration.getInt("world-settings." + name + ".cactus-growth-modifier", cactusGrowthModifier);
@@ -135,6 +139,8 @@ public class CraftWorld implements World {
@@ -138,6 +142,8 @@ public class CraftWorld implements World {
public boolean randomLightingUpdates = false;
public int mobSpawnRange = 4;
public int aggregateTicks = 4;
@@ -106,7 +106,7 @@ index b510748..9343d46 100644
public int wheatGrowthModifier = 100;
public int cactusGrowthModifier = 100;
diff --git a/src/main/resources/configurations/bukkit.yml b/src/main/resources/configurations/bukkit.yml
index 58501ea..87f9f1c 100644
index bc00ad4..524c0ca 100644
--- a/src/main/resources/configurations/bukkit.yml
+++ b/src/main/resources/configurations/bukkit.yml
@@ -37,6 +37,8 @@ world-settings: