Merge branch 'development' into networkRefactor

gatoborrachon · Apr 6, 2015 · 1997054 · 1997054
2 parents f4a6fb8 + cbb8cbc
commit 1997054
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/main/java/mekanism/client/ThreadSparkle.java b/src/main/java/mekanism/client/ThreadSparkle.java
@@ -83,11 +83,16 @@ public void loop(TileEntity tileEntity)
 
 		for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
 		{
-			TileEntity tile = Coord4D.get(tileEntity).getFromSide(side).getTileEntity(pointer.getWorldObj());
-
-			if(tile != null && isNode(tile) && !iteratedNodes.contains(tile))
+			Coord4D coord = Coord4D.get(tileEntity).getFromSide(side);
+			
+			if(coord.exists(pointer.getWorldObj()))
 			{
-				loop(tile);
+				TileEntity tile = coord.getTileEntity(pointer.getWorldObj());
+
+				if(tile != null && isNode(tile) && !iteratedNodes.contains(tile))
+				{
+					loop(tile);
+				}
 			}
 		}
 	}