aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2018-09-20 07:50:37 +0200
committerDream-Master <dream-master@gmx.net>2018-09-20 07:50:37 +0200
commite28a544140e37443039cc5720fc03134a7d15e34 (patch)
tree7dcb2e6cb1bc1dea3d7e91267857f1e9b087cfc9 /src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
parent936d25dfca4e67bf9ea8b52709ab9136290490e2 (diff)
parent3cce53ccc294c7686d2c4b7bffbedc6e182cb06d (diff)
downloadGT5-Unofficial-e28a544140e37443039cc5720fc03134a7d15e34.tar.gz
GT5-Unofficial-e28a544140e37443039cc5720fc03134a7d15e34.tar.bz2
GT5-Unofficial-e28a544140e37443039cc5720fc03134a7d15e34.zip
Merge branch 'experimental' into GT_Bees_dev
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java')
-rw-r--r--src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 5ffae94456..d99ce1bc41 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -988,6 +988,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
return inputEnergyFrom(aSide, true);
}
+ @Override
public boolean inputEnergyFrom(byte aSide, boolean waitForActive) {
if (aSide == 6) return true;
if (isServerSide() && waitForActive) return ((aSide >= 0 && aSide < 6) && mActiveEUInputs[aSide]) && !mReleaseEnergy;