apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Natalie's NEI-breaking bug fix #70

Merged
SenseiKiwi merged 9 commits from master into master 2013-08-22 19:57:14 +00:00
Conversation 0 Commits 9 Files Changed 6 +22 -5
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 40310688ed - Show all commits

19
StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java
View File

@@ -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;
} }