diff options
| author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-08 22:57:38 +0000 |
|---|---|---|
| committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-05-08 22:57:38 +0000 |
| commit | dae0ce78d19f72df3f136327908001027b660ef7 (patch) | |
| tree | 200665dd0df9cabd361f1db2eb49f491ec6103e4 | |
| parent | 14b53db85ab408ea302f18c31d4e46ef74469fd4 (diff) | |
| download | Essentials-dae0ce78d19f72df3f136327908001027b660ef7.tar Essentials-dae0ce78d19f72df3f136327908001027b660ef7.tar.gz Essentials-dae0ce78d19f72df3f136327908001027b660ef7.tar.lz Essentials-dae0ce78d19f72df3f136327908001027b660ef7.tar.xz Essentials-dae0ce78d19f72df3f136327908001027b660ef7.zip | |
[trunk] New config property: nether.ratio, defaults to 16.
Please update use1to1ratio to ratio: 1.0
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1378 e251c2fe-e539-e718-e476-b85c1f46cddb
4 files changed, 13 insertions, 33 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index c2975e3c6..236bb3a53 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -101,25 +101,11 @@ public class EssentialsPlayerListener extends PlayerListener double factor; if (user.getWorld().getEnvironment() == World.Environment.NETHER && world.getEnvironment() == World.Environment.NORMAL) { - if (ess.getSettings().use1to1RatioInNether()) - { - factor = 1.0; - } - else - { - factor = 16.0; - } + factor = ess.getSettings().getNetherRatio(); } else if (user.getWorld().getEnvironment() != world.getEnvironment()) { - if (ess.getSettings().use1to1RatioInNether()) - { - factor = 1.0; - } - else - { - factor = 1.0 / 16.0; - } + factor = 1.0 / ess.getSettings().getNetherRatio(); } else { diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index edea6ae91..a394bcbdb 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -471,6 +471,14 @@ public class Settings implements IConf return config.getBoolean("nether.use-1to1-ratio", false); } + public double getNetherRatio() + { + if (config.getBoolean("nether.use-1to1-ratio", false)) { + return 1.0; + } + return config.getDouble("nether.ratio", 16.0); + } + public boolean isDebug() { return config.getBoolean("debug", false); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java index 6abacb6fd..044e0868e 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java @@ -53,25 +53,11 @@ public class Commandworld extends EssentialsCommand double factor; if (user.getWorld().getEnvironment() == World.Environment.NETHER && world.getEnvironment() == World.Environment.NORMAL) { - if (ess.getSettings().use1to1RatioInNether()) - { - factor = 1.0; - } - else - { - factor = 16.0; - } + factor = ess.getSettings().getNetherRatio(); } else if (user.getWorld().getEnvironment() != world.getEnvironment()) { - if (ess.getSettings().use1to1RatioInNether()) - { - factor = 1.0; - } - else - { - factor = 1.0 / 16.0; - } + factor = 1.0 / ess.getSettings().getNetherRatio(); } else { diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 1a579fe1f..5abd44543 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -75,7 +75,7 @@ nether: folder: nether portals-enabled: false generate-exit-portals: false - use-1to1-ratio: false + ratio: 16 # Mob limit on spawnmob spawnmob-limit: 10 |