Merge branch 'v9' into 1.8.9

This commit is contained in:
Ben Spiers committed 2016-01-19 17:57:19 +00:00
commit 39dc016908
23 files changed
+499 -97

No files matched your search

@@ -199,13 +199,17 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
if(structure.locations.contains(Coord4D.get(pointer)) && isCorrectCorner(Coord4D.get(tile), origX+xmin, origY+ymin, origZ+zmin))
{
structureFound = structure;
return;
if(isInteriorValid(structure))
{
structureFound = structure;
return;
}
}
}
}
}
innerNodes.clear();
iteratedNodes.add(tile);
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
@@ -221,6 +225,11 @@ public abstract class UpdateProtocol<T extends SynchronizedData<T>>
}
}
}
public boolean isInteriorValid(T structure)
{
return true;
}
public ForgeDirection getSide(Coord4D obj, int xmin, int xmax, int ymin, int ymax, int zmin, int zmax)
{