upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-10-25 20:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from GTNewHorizons/feature/checks

Browse Source 
Some safety checks
This commit is contained in:
boubou19 authored and GitHub committed 2022-08-03 08:46:47 +02:00
2 parents fb65570ce9 9fa67a8426
commit 011a5767a7
2 files changed
+19 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/main/utils/BlockUtil.java
+3 -1
View File
@@ -67,7 +67,9 @@ public class BlockUtil {
for (int chunkX = minChunkX; chunkX <= maxChunkX; ++chunkX) {
for (int chunkZ = minChunkZ; chunkZ <= maxChunkZ; ++chunkZ) {
searchChunks.add(world.getChunkFromChunkCoords(chunkX, chunkZ));
Chunk chunk = world.getChunkFromChunkCoords(chunkX, chunkZ);
if (chunk != null)
searchChunks.add(chunk);
}
}
src/main/java/magicbees/main/utils/compat/thaumcraft/NodeHelper.java
+16 -11
View File
@@ -33,6 +33,9 @@ public class NodeHelper {
@SuppressWarnings("unchecked")
public static INode findNode(Chunk chunk, int x, int y, int z, int range) {
if (chunk == null)
return null;
Vec3 apiaryPos = Vec3.createVectorHelper(x, y, z);
List<TileEntity> tileEntities = new ArrayList<TileEntity>(((Map<ChunkPosition, TileEntity>)chunk.chunkTileEntityMap).values());
Collections.shuffle(tileEntities);
@@ -52,17 +55,19 @@ public class NodeHelper {
@SuppressWarnings("unchecked")
public static List<INode> findNodesInChunkWithinRange(Chunk chunk, int x, int y, int z, int range) {
List<INode> nodes = new ArrayList<INode>();
Vec3 apiaryPos = Vec3.createVectorHelper(x, y, z);
List<TileEntity> tileEntities = new ArrayList<TileEntity>(((Map<ChunkPosition, TileEntity>)chunk.chunkTileEntityMap).values());
for (TileEntity entity : tileEntities) {
if (entity instanceof INode) {
Vec3 tePos = Vec3.createVectorHelper(entity.xCoord, entity.yCoord, entity.zCoord);
Vec3 result = apiaryPos.subtract(tePos);
if (result.lengthVector() <= range) {
nodes.add((INode)entity);
}
}
}
if (chunk != null) {
Vec3 apiaryPos = Vec3.createVectorHelper(x, y, z);
List<TileEntity> tileEntities = new ArrayList<TileEntity>(((Map<ChunkPosition, TileEntity>) chunk.chunkTileEntityMap).values());
for (TileEntity entity : tileEntities) {
if (entity instanceof INode) {
Vec3 tePos = Vec3.createVectorHelper(entity.xCoord, entity.yCoord, entity.zCoord);
Vec3 result = apiaryPos.subtract(tePos);
if (result.lengthVector() <= range) {
nodes.add((INode) entity);
}
}
}
}
return nodes;
}