yCoordhelper: added top-down search (may be redundant)
This is used for the code that determines where to come out of Limbo in. It tries to search from the top down to find a solid block to stand on. Isn't complete, though. This code does need some considerations put in, though... I'm concerned about Natura's clouds, for instance.
This commit is contained in:
parent
2d6194d599
commit
40310688ed
1 changed files with 22 additions and 5 deletions
|
@ -21,6 +21,9 @@ public class yCoordHelper
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getFirstUncovered(int worldID, int x, int yStart, int z)
|
public static int getFirstUncovered(int worldID, int x, int yStart, int z)
|
||||||
|
{ return getFirstUncovered(worldID, x, yStart, z, false); }
|
||||||
|
|
||||||
|
public static int getFirstUncovered(int worldID, int x, int yStart, int z, boolean fromTop)
|
||||||
{
|
{
|
||||||
if (dimHelper.getWorld(worldID) == null ||
|
if (dimHelper.getWorld(worldID) == null ||
|
||||||
dimHelper.getWorld(worldID).provider == null)
|
dimHelper.getWorld(worldID).provider == null)
|
||||||
|
@ -28,10 +31,13 @@ public class yCoordHelper
|
||||||
dimHelper.initDimension(worldID);
|
dimHelper.initDimension(worldID);
|
||||||
}
|
}
|
||||||
|
|
||||||
return yCoordHelper.getFirstUncovered(dimHelper.getWorld(worldID), x, yStart, z);
|
return yCoordHelper.getFirstUncovered(dimHelper.getWorld(worldID), x, yStart, z, fromTop);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getFirstUncovered(World world, int x, int yStart, int z)
|
public static int getFirstUncovered(World world, int x, int yStart, int z)
|
||||||
|
{ return getFirstUncovered(world, x, yStart, z, false); }
|
||||||
|
|
||||||
|
public static int getFirstUncovered(World world, int x, int yStart, int z, boolean fromTop)
|
||||||
{
|
{
|
||||||
Chunk chunk = world.getChunkProvider().loadChunk(x >> 4, z >> 4);
|
Chunk chunk = world.getChunkProvider().loadChunk(x >> 4, z >> 4);
|
||||||
|
|
||||||
|
@ -40,11 +46,22 @@ public class yCoordHelper
|
||||||
int height = MAXIMUM_UNCOVERED_Y; //world.getHeight();
|
int height = MAXIMUM_UNCOVERED_Y; //world.getHeight();
|
||||||
int y;
|
int y;
|
||||||
|
|
||||||
|
if(!fromTop)
|
||||||
|
{
|
||||||
boolean covered = true;
|
boolean covered = true;
|
||||||
for (y = yStart; y < height && covered; y++)
|
for (y = yStart; y < height && covered; y++)
|
||||||
{
|
{
|
||||||
covered = IsCoveredBlock(chunk, localX, y - 1, localZ) || IsCoveredBlock(chunk, localX, y, localZ);
|
covered = IsCoveredBlock(chunk, localX, y - 1, localZ) || IsCoveredBlock(chunk, localX, y, localZ);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
boolean covered = false;
|
||||||
|
for (y = MAXIMUM_UNCOVERED_Y; y > 1 && !covered; y--)
|
||||||
|
{
|
||||||
|
covered = IsCoveredBlock(chunk, localX, y - 1, localZ);
|
||||||
|
}
|
||||||
|
if (!covered) y = 63;
|
||||||
|
y++;
|
||||||
|
}
|
||||||
|
|
||||||
return y;
|
return y;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue