Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-07-23 12:24:48 +02:00
Code Issues Projects Releases Wiki Activity

Add small optimization tweak to new safe block function.

Browse Source
This commit is contained in:
KHobbits 2012-07-17 01:28:20 +01:00
parent fb71ebdfdf
commit 141a2bb190
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Essentials/src/com/earth2me/essentials/Util.java
View File

@ -296,14 +296,14 @@ public class Util
int x = loc.getBlockX(); int x = loc.getBlockX();
int y = (int)Math.round(loc.getY()); int y = (int)Math.round(loc.getY());
int z = loc.getBlockZ(); int z = loc.getBlockZ();
final int oy = y; final int origY = y;
while (isBlockAboveAir(world, x, y, z)) while (isBlockAboveAir(world, x, y, z))
{ {
y -= 1; y -= 1;
if (y < 0) if (y < 0)
{ {
y = oy; y = origY;
break; break;
} }
} }
@ -315,7 +315,7 @@ public class Util
{ {
x -= 3; x -= 3;
z -= 3; z -= 3;
y = oy + 4; y = origY + 4;
break; break;
} }
} }
@ -323,10 +323,9 @@ public class Util
while (isBlockUnsafe(world, x, y, z)) while (isBlockUnsafe(world, x, y, z))
{ {
y -= 1; y -= 1;
if (y + 4 < oy) if (y + 4 < origY)
{ {
x += 1; x += 1;
y = oy + 4;
if (x - 3 > loc.getBlockX()) if (x - 3 > loc.getBlockX())
{ {
x = loc.getBlockX() - 3; x = loc.getBlockX() - 3;
@ -339,6 +338,12 @@ public class Util
break; break;
} }
} }
y = origY + 4;
if (origY - 4 > world.getHighestBlockYAt(x, z))
{
y = origY - 4;
}
} }
} }