diff options
| author | Techlone <techlone.mc@gmail.com> | 2016-06-19 21:08:46 +0500 |
|---|---|---|
| committer | Techlone <techlone.mc@gmail.com> | 2016-06-19 21:08:46 +0500 |
| commit | 708f59d6e7f46868c06b14aa56de556413973751 (patch) | |
| tree | 30ec79466de710ec57d8dfa3e643ecdccc151e71 /src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | |
| parent | 39292a9626b1bcd2fb7370f191d4ce91def50519 (diff) | |
| parent | 1ace2c4e35b21da7fc1070f3df24299a5892e498 (diff) | |
| download | GT5-Unofficial-708f59d6e7f46868c06b14aa56de556413973751.tar.gz GT5-Unofficial-708f59d6e7f46868c06b14aa56de556413973751.tar.bz2 GT5-Unofficial-708f59d6e7f46868c06b14aa56de556413973751.zip | |
Merge branch 'experimental' of https://github.com/Blood-Asp/GT5-Unofficial into experimental
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; |