diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-08-13 09:10:38 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-08-13 09:10:38 +0100 |
| commit | 0345ada52c4e70bd167c1decc63209c4ef79f3bc (patch) | |
| tree | ebdcc1a78bc3288d8325b6eee48f41a7ddcbd39a /src/main/java/gregtech/api/metatileentity | |
| parent | 9ca24419fbec417937d4014ab7c21434ebd79366 (diff) | |
| download | GT5-Unofficial-0345ada52c4e70bd167c1decc63209c4ef79f3bc.tar.gz GT5-Unofficial-0345ada52c4e70bd167c1decc63209c4ef79f3bc.tar.bz2 GT5-Unofficial-0345ada52c4e70bd167c1decc63209c4ef79f3bc.zip | |
Remove null checks
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 9917ca62d7..03553336ae 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -397,7 +397,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE if (getEUCapacity() > 0) { if (GregTech_API.sMachineFireExplosions && getRandomNumber(1000) == 0) { Block tBlock = getBlockAtSide((byte) getRandomNumber(6)); - if (tBlock != null && tBlock instanceof BlockFire) doEnergyExplosion(); + if (tBlock instanceof BlockFire) doEnergyExplosion(); } if (!hasValidMetaTileEntity()) { diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java index 26388bd187..fda019f486 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java @@ -75,7 +75,7 @@ public class BaseMetaTileEntityUE extends BaseMetaTileEntity /*implements IUETil for (byte i = 0; i < 6; i++) { if (inputEnergyFrom(i)) { Object tTileEntity = getTileEntityAtSide(i); - if (tTileEntity != null && tTileEntity instanceof IConductor) { + if (tTileEntity instanceof IConductor) { rSides.add(ForgeDirection.getOrientation(i)); } } @@ -88,7 +88,7 @@ public class BaseMetaTileEntityUE extends BaseMetaTileEntity /*implements IUETil for (byte i = 0; i < 6; i++) { if (outputsEnergyTo(i)) { Object tTileEntity = getTileEntityAtSide(i); - if (tTileEntity != null && tTileEntity instanceof IConductor) { + if (tTileEntity instanceof IConductor) { rSides.add(ForgeDirection.getOrientation(i)); } } |