Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 00:38:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix an energy dupe bug with batteries

Browse source
This commit is contained in:
Ellpeck 2016-11-23 18:25:08 +01:00
parent 3ed5e9cc8a
commit 9b2628e9aa
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java
View file

@ -59,12 +59,12 @@ public class ItemBattery extends ItemEnergy{
Item item = slot.getItem(); Item item = slot.getItem();
if(item instanceof IEnergyContainerItem){ if(item instanceof IEnergyContainerItem){
received = ((IEnergyContainerItem)item).receiveEnergy(slot, this.getEnergyStored(stack), false); received = ((IEnergyContainerItem)item).receiveEnergy(slot, this.extractEnergy(stack, Integer.MAX_VALUE, true), false);
} }
else if(ActuallyAdditions.teslaLoaded && slot.hasCapability(TeslaUtil.teslaConsumer, null)){ else if(ActuallyAdditions.teslaLoaded && slot.hasCapability(TeslaUtil.teslaConsumer, null)){
ITeslaConsumer cap = slot.getCapability(TeslaUtil.teslaConsumer, null); ITeslaConsumer cap = slot.getCapability(TeslaUtil.teslaConsumer, null);
if(cap != null){ if(cap != null){
received = (int)cap.givePower(this.getEnergyStored(stack), false); received = (int)cap.givePower(this.extractEnergy(stack, Integer.MAX_VALUE, true), false);
} }
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java
View file

@ -147,7 +147,7 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple
@Override @Override
public void extractEnergy(int amount){ public void extractEnergy(int amount){
this.storage.extractEnergyInternal(amount, false); this.storage.extractEnergy(amount, false);
} }
@Override @Override