diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-06-21 00:17:12 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-06-21 00:17:12 +0100 |
| commit | 660105ba28d6dd912160a9dc800c876f72e6873f (patch) | |
| tree | 8021e21b16d4b2b6f2a02ec5771d47fe9ff210ac /src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | |
| parent | 8e25705a3d5f623214af06bd0645dfaaf3a72c15 (diff) | |
| parent | f708fc5ff8faca68dcc334bcf85560630157cbf1 (diff) | |
| download | GT5-Unofficial-660105ba28d6dd912160a9dc800c876f72e6873f.tar.gz GT5-Unofficial-660105ba28d6dd912160a9dc800c876f72e6873f.tar.bz2 GT5-Unofficial-660105ba28d6dd912160a9dc800c876f72e6873f.zip | |
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 506d76e84d..1470ac733d 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -448,6 +448,12 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE for (int i = mMetaTileEntity.dechargerSlotStartIndex(), k = mMetaTileEntity.dechargerSlotCount() + i; i < k; i++) { if (mMetaTileEntity.mInventory[i] != null && getStoredEU() < getEUCapacity()) { dischargeItem(mMetaTileEntity.mInventory[i]); + if(ic2.api.info.Info.itemEnergy.getEnergyValue(mMetaTileEntity.mInventory[i])>0){ + if((getStoredEU() + ic2.api.info.Info.itemEnergy.getEnergyValue(mMetaTileEntity.mInventory[i]))<getEUCapacity()){ + increaseStoredEnergyUnits((long)ic2.api.info.Info.itemEnergy.getEnergyValue(mMetaTileEntity.mInventory[i]),false); + mMetaTileEntity.mInventory[i].stackSize--; + } + } if (mMetaTileEntity.mInventory[i].stackSize <= 0) mMetaTileEntity.mInventory[i] = null; mInventoryChanged = true; |