diff options
| author | Timeslice42 <timeslice@iname.com> | 2016-11-04 05:32:56 -0700 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2016-11-05 22:11:36 +0100 |
| commit | 7df5add5a90ca8f8b5f974306774927e7554bdee (patch) | |
| tree | a604cdef1fcdf97f683ef0c55d54095ff05560ac | |
| parent | 58206f909ec40d98792040cdfb2da8de90b1ca74 (diff) | |
| download | GT5-Unofficial-7df5add5a90ca8f8b5f974306774927e7554bdee.tar.gz GT5-Unofficial-7df5add5a90ca8f8b5f974306774927e7554bdee.tar.bz2 GT5-Unofficial-7df5add5a90ca8f8b5f974306774927e7554bdee.zip | |
Re-add single-use batteries
How did this get removed? ><
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index c45dca4aa8..60e918de4c 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -445,6 +445,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; @@ -1871,4 +1877,4 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider) { mMetaTileEntity.onEntityCollidedWithBlock(aWorld, aX, aY, aZ, collider); } -}
\ No newline at end of file +} |