summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-04-15 23:06:29 +0000
committerementalo <ementalo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-04-15 23:06:29 +0000
commite4ce7857213084ee23834b5a6ef448b1cd9d6f2f (patch)
treed3182c1b73f24c3c866757194eb22ad348e63e0e
parent85c8ae86656536522f7ce84c983e6ca5b0dad4c6 (diff)
downloadEssentials-e4ce7857213084ee23834b5a6ef448b1cd9d6f2f.tar
Essentials-e4ce7857213084ee23834b5a6ef448b1cd9d6f2f.tar.gz
Essentials-e4ce7857213084ee23834b5a6ef448b1cd9d6f2f.tar.lz
Essentials-e4ce7857213084ee23834b5a6ef448b1cd9d6f2f.tar.xz
Essentials-e4ce7857213084ee23834b5a6ef448b1cd9d6f2f.zip
[trunk] new setting use-1to1-ratio if true sets the nether offset when using world to 1:1 else defaults to normal nether ratio
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1201 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--Essentials/src/com/earth2me/essentials/Settings.java5
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandworld.java9
-rw-r--r--Essentials/src/config.yml1
3 files changed, 14 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java
index 97faffc33..8da672990 100644
--- a/Essentials/src/com/earth2me/essentials/Settings.java
+++ b/Essentials/src/com/earth2me/essentials/Settings.java
@@ -458,4 +458,9 @@ public class Settings implements IConf
{
return config.getBoolean("protect.disable.warn-on-build-disallow", false);
}
+
+ public boolean use1to1RatioInNether()
+ {
+ return config.getBoolean("nether.use-1to1-ratio", false);
+ }
}
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
index 41a2d270d..93e452fd3 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandworld.java
@@ -51,7 +51,14 @@ public class Commandworld extends EssentialsCommand
double factor;
if (user.getWorld().getEnvironment() == World.Environment.NETHER && world.getEnvironment() == World.Environment.NORMAL)
- factor = 16;
+ if (Essentials.getSettings().use1to1RatioInNether())
+ {
+ factor = 1;
+ }
+ else
+ {
+ factor = 16;
+ }
else if (user.getWorld().getEnvironment() != world.getEnvironment())
factor = 1 / 16;
else
diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 4da7401e4..002e4636b 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -65,6 +65,7 @@ nether:
folder: nether
portals-enabled: false
generate-exit-portals: false
+ use-1to1-ratio: false
# Mob limit on spawnmob
spawnmob-limit: 10