aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-06-06 16:19:45 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2017-06-06 16:19:45 +0200
commit589a77c5cbc47634d84d8e94d422ad9ad88ec361 (patch)
tree2d516b49ae7953e75235d09b87d10b28ae01977e /src/main/java
parent530a334bb10b9d945d1bc0dffa0fae5fbf8ee41a (diff)
downloadGT5-Unofficial-589a77c5cbc47634d84d8e94d422ad9ad88ec361.tar.gz
GT5-Unofficial-589a77c5cbc47634d84d8e94d422ad9ad88ec361.tar.bz2
GT5-Unofficial-589a77c5cbc47634d84d8e94d422ad9ad88ec361.zip
Check general redstoneoutput for null
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 814ba6be37..8dd8eefe7e 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -1417,7 +1417,12 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
@Override
public byte getOutputRedstoneSignal(byte aSide) {
- return getCoverBehaviorAtSide(aSide).manipulatesSidedRedstoneOutput(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this) ? mSidedRedstone[aSide] : mMetaTileEntity.allowGeneralRedstoneOutput() ? mSidedRedstone[aSide] : 0;
+ return getCoverBehaviorAtSide(aSide).manipulatesSidedRedstoneOutput(aSide, getCoverIDAtSide(aSide), getCoverDataAtSide(aSide), this) ? mSidedRedstone[aSide] : getGeneralRS(aSide);
+ }
+
+ public byte getGeneralRS(byte aSide){
+ if(mMetaTileEntity==null)return 0;
+ return mMetaTileEntity.allowGeneralRedstoneOutput() ? mSidedRedstone[aSide] : 0;
}
@Override