summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2012-03-02 00:18:31 +0100
committersnowleo <schneeleo@gmail.com>2012-03-02 00:18:31 +0100
commit7564ebf79e3207c651bdbae5d0616260cbffc5c1 (patch)
tree40e794bcfc63c944701cb15ba7f914746307a566
parentb9aecbe1d4aac5046c871bcb4439ea3ad11eee5c (diff)
downloadEssentials-7564ebf79e3207c651bdbae5d0616260cbffc5c1.tar
Essentials-7564ebf79e3207c651bdbae5d0616260cbffc5c1.tar.gz
Essentials-7564ebf79e3207c651bdbae5d0616260cbffc5c1.tar.lz
Essentials-7564ebf79e3207c651bdbae5d0616260cbffc5c1.tar.xz
Essentials-7564ebf79e3207c651bdbae5d0616260cbffc5c1.zip
Fix world heights
-rw-r--r--Essentials/src/com/earth2me/essentials/Util.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandnuke.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java
index 3e3a7efd0..238ff0c00 100644
--- a/Essentials/src/com/earth2me/essentials/Util.java
+++ b/Essentials/src/com/earth2me/essentials/Util.java
@@ -293,7 +293,7 @@ public class Util
while (isBlockUnsafe(world, x, y, z))
{
y += 1;
- if (y >= 127)
+ if (y >= world.getHighestBlockYAt(x, z))
{
x += 1;
break;
@@ -304,8 +304,8 @@ public class Util
y -= 1;
if (y <= 1)
{
- y = 127;
x += 1;
+ y = world.getHighestBlockYAt(x, z);
if (x - 32 > loc.getBlockX())
{
throw new Exception(_("holeInFloor"));
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java b/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java
index ac92110cd..19695233e 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandnuke.java
@@ -51,7 +51,7 @@ public class Commandnuke extends EssentialsCommand
{
for (int z = -10; z <= 10; z += 5)
{
- final Location tntloc = new Location(world, loc.getBlockX() + x, 127, loc.getBlockZ() + z);
+ final Location tntloc = new Location(world, loc.getBlockX() + x, world.getMaxHeight(), loc.getBlockZ() + z);
final TNTPrimed tnt = world.spawn(tntloc, TNTPrimed.class);
}
}