Merge branch 'development' into networkRefactor

This commit is contained in:
Ben Spiers 2015-04-06 04:36:11 +01:00
commit 1997054bad

View file

@ -83,7 +83,11 @@ public class ThreadSparkle extends Thread
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{ {
TileEntity tile = Coord4D.get(tileEntity).getFromSide(side).getTileEntity(pointer.getWorldObj()); Coord4D coord = Coord4D.get(tileEntity).getFromSide(side);
if(coord.exists(pointer.getWorldObj()))
{
TileEntity tile = coord.getTileEntity(pointer.getWorldObj());
if(tile != null && isNode(tile) && !iteratedNodes.contains(tile)) if(tile != null && isNode(tile) && !iteratedNodes.contains(tile))
{ {
@ -91,6 +95,7 @@ public class ThreadSparkle extends Thread
} }
} }
} }
}
public boolean isNode(TileEntity tile) public boolean isNode(TileEntity tile)
{ {