Skip to content

Commit 6c1a60f

Browse files
FeikoJoostenthraaawn
authored andcommitted
Added additional null-checks to avoid client-side NPE's
Added additional null-checks to avoid client-side NPE's in some edge cases involving (at least) Mekanism machines/blocks being placed right next to a TileEntity Tunnel.
1 parent 510066f commit 6c1a60f

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

src/main/java/org/dave/compactmachines3/tile/TileEntityTunnel.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import org.dave.compactmachines3.world.tools.DimensionTools;
1414
import org.dave.compactmachines3.world.tools.StructureTools;
1515

16+
import java.util.HashMap;
17+
1618
public class TileEntityTunnel extends BaseTileEntityTunnel implements ICapabilityProvider, IRemoteBlockProvider {
1719

1820
@Override
@@ -50,8 +52,18 @@ public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
5052

5153
return super.hasCapability(capability, facing);
5254
}
55+
56+
WorldSavedDataMachines wsd = WorldSavedDataMachines.INSTANCE;
57+
if (wsd == null) {
58+
return false;
59+
}
60+
61+
HashMap<Integer, DimensionBlockPos> machinePositions = wsd.machinePositions;
62+
if (machinePositions == null) {
63+
return false;
64+
}
5365

54-
DimensionBlockPos dimpos = WorldSavedDataMachines.INSTANCE.machinePositions.get(StructureTools.getCoordsForPos(this.getPos()));
66+
DimensionBlockPos dimpos = machinePositions.get(StructureTools.getCoordsForPos(this.getPos()));
5567
if(dimpos == null) {
5668
return false;
5769
}

0 commit comments

Comments
 (0)