diff options
| author | Logan Perkins <perkins@github.alestan.publicvm.com> | 2016-06-24 16:05:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 16:05:20 -0700 |
| commit | 8cd97be0862bbe00e989b3fbdc0bee536f094586 (patch) | |
| tree | 48c270237f1d4ae1b8eb37885cd7d6ea2025b2ab /src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | |
| parent | f16aeb2d1fdd406d7281d45ce764a485e4b71064 (diff) | |
| parent | 01b15f4251c7e4a9278748562dc28beed41f545c (diff) | |
| download | GT5-Unofficial-8cd97be0862bbe00e989b3fbdc0bee536f094586.tar.gz GT5-Unofficial-8cd97be0862bbe00e989b3fbdc0bee536f094586.tar.bz2 GT5-Unofficial-8cd97be0862bbe00e989b3fbdc0bee536f094586.zip | |
Merge pull request #1 from Blood-Asp/experimental
Update to latest from official
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; |