aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/implementations
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2018-09-09 09:28:53 -0700
committerJason Mitchell <mitchej@gmail.com>2018-09-09 09:28:53 -0700
commit6e6baf615dfcef4aa684fbe50816ed184d1ed6a5 (patch)
tree21a49af7565123014ac045e6a0ed41c7f3914776 /src/main/java/gregtech/api/metatileentity/implementations
parent39ff969968dc22ce171e565d9aa733b6ea3f4439 (diff)
downloadGT5-Unofficial-6e6baf615dfcef4aa684fbe50816ed184d1ed6a5.tar.gz
GT5-Unofficial-6e6baf615dfcef4aa684fbe50816ed184d1ed6a5.tar.bz2
GT5-Unofficial-6e6baf615dfcef4aa684fbe50816ed184d1ed6a5.zip
handle nulls
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index ac0f688c69..98e596713e 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -214,7 +214,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
if (i != aSide && isConnectedAtSide(i) && baseMetaTile.getCoverBehaviorAtSide(i).letsEnergyOut(i, baseMetaTile.getCoverIDAtSide(i), baseMetaTile.getCoverDataAtSide(i), baseMetaTile)) {
final TileEntity tTileEntity = baseMetaTile.getTileEntityAtSide(i);
- if (aAlreadyPassedSet.add(tTileEntity)) {
+ if (tTileEntity != null && aAlreadyPassedSet.add(tTileEntity)) {
final byte tSide = GT_Utility.getOppositeSide(i);
final IGregTechTileEntity tBaseMetaTile = tTileEntity instanceof IGregTechTileEntity ? ((IGregTechTileEntity) tTileEntity) : null;
final IMetaTileEntity tMeta = tBaseMetaTile != null ? tBaseMetaTile.getMetaTileEntity() : null;
@@ -243,7 +243,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
}
private long insertEnergyInto(TileEntity tTileEntity, byte tSide, long aVoltage, long aAmperage) {
- if (aAmperage == 0) return 0;
+ if (aAmperage == 0 || tTileEntity == null) return 0;
final IGregTechTileEntity baseMetaTile = getBaseMetaTileEntity();
final ForgeDirection tDirection = ForgeDirection.getOrientation(tSide);