Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed pre-jump checklist loading all ships in the world

Browse source
This commit is contained in:
Unknown 2018-05-13 20:58:49 +02:00
parent 1b0a82a287
commit d9a0d3a84b
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/cr0s/warpdrive/data/StarMapRegistry.java
View file

@ -390,6 +390,13 @@ public class StarMapRegistry {
continue; continue;
} }
// Compare areas for intersection
final AxisAlignedBB aabb2 = AxisAlignedBB.getBoundingBox(registryItem.minX, registryItem.minY, registryItem.minZ,
registryItem.maxX, registryItem.maxY, registryItem.maxZ);
if (!aabb1.intersectsWith(aabb2)) {
continue;
}
// Skip missing ship cores // Skip missing ship cores
final TileEntity tileEntity = core.getWorldObj().getTileEntity(registryItem.x, registryItem.y, registryItem.z); final TileEntity tileEntity = core.getWorldObj().getTileEntity(registryItem.x, registryItem.y, registryItem.z);
if (!(tileEntity instanceof TileEntityShipCore)) { if (!(tileEntity instanceof TileEntityShipCore)) {
@ -407,12 +414,8 @@ public class StarMapRegistry {
continue; continue;
} }
// Compare areas for intersection // ship is intersecting, online and valid
final AxisAlignedBB aabb2 = AxisAlignedBB.getBoundingBox(registryItem.minX, registryItem.minY, registryItem.minZ, return true;
registryItem.maxX, registryItem.maxY, registryItem.maxZ);
if (aabb1.intersectsWith(aabb2)) {
return true;
}
} }
return false; return false;
@ -453,8 +456,10 @@ public class StarMapRegistry {
} }
// skip unloaded chunks // skip unloaded chunks
if (!isLoaded) { if (!isLoaded) {
WarpDrive.logger.info(String.format("Skipping non-loaded star map entry %s", if (WarpDrive.isDev) {
registryItem)); WarpDrive.logger.info(String.format("Skipping non-loaded star map entry %s",
registryItem));
}
continue; continue;
} }