fix crash caused by placing piles immediately adjacent to RBMKs

HbmMods · Feb 26, 2025 · a6b1a90 · a6b1a90
1 parent bb84ebe
commit a6b1a90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/hbm/handler/neutron/PileNeutronHandler.java b/src/main/java/com/hbm/handler/neutron/PileNeutronHandler.java
@@ -65,7 +65,7 @@ public void runStreamInteraction(World worldObj) {
 				TileEntity tile;
 
 				NeutronNode node = NeutronNodeWorld.getNode(worldObj, nodePos);
-				if(node != null) {
+				if(node != null && node instanceof PileNeutronNode) {
 					tile = node.tile;
 				} else {
 					tile = blockPosToTE(worldObj, nodePos);

diff --git a/src/main/java/com/hbm/handler/neutron/RBMKNeutronHandler.java b/src/main/java/com/hbm/handler/neutron/RBMKNeutronHandler.java
@@ -222,7 +222,7 @@ public NeutronNode[] getNodes(boolean addNode) {
 				pos.mutate(origin.tile.xCoord + x, origin.tile.yCoord, origin.tile.zCoord + z);
 
 				NeutronNode node = NeutronNodeWorld.getNode(world, pos);
-				if(node != null) {
+				if(node != null && node instanceof RBMKNeutronNode) {
 					positions[i - 1] = node;
 				} else if(this.origin.tile.getBlockType() instanceof RBMKBase) {
 					TileEntity te = blockPosToTE(world, pos);
@@ -292,7 +292,7 @@ else if(hits > 0) { // If stream is partially blocked.
 
 				RBMKType type = (RBMKType) targetNode.data.get("type");
 
-				if(type == RBMKType.OTHER) // pass right on by!
+				if(type == RBMKType.OTHER || type == null) // pass right on by!
 					continue;
 
 				// we established earlier during `getNodes()` that they should all be RBMKBase TEs