aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-09-15 15:40:06 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-09-15 15:40:06 +0100
commitb10acf8244e3e69f7b37af2a1506eb71f57834c2 (patch)
treeb339af410e4f91ecb9919aeab8da523ca5230a22 /src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java
parent55133748f138fef56973ee7f670da9d353cbfc73 (diff)
parentc997df59522511e899b4bb01a667b48646029450 (diff)
downloadGT5-Unofficial-b10acf8244e3e69f7b37af2a1506eb71f57834c2.tar.gz
GT5-Unofficial-b10acf8244e3e69f7b37af2a1506eb71f57834c2.tar.bz2
GT5-Unofficial-b10acf8244e3e69f7b37af2a1506eb71f57834c2.zip
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java')
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntityUE.java4
1 files changed, 2 insertions, 2 deletions
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));
}
}