aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java2
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java4
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 1ee4ee50f6..5902a70620 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -398,7 +398,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));
}
}