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

Fixed Drill Charging with Items before

Browse source
This commit is contained in:
Ellpeck 2015-07-16 17:42:19 +02:00
parent 6ebe2c234d
commit cb584b6e93
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java
View file

@ -76,9 +76,6 @@ public class ItemDrill extends ItemEnergy implements INameableItem{
} }
public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5){ public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5){
NBTTagCompound compound = stack.getTagCompound();
if(compound == null) return;
ItemStack[] slots = this.getSlotsFromNBT(stack); ItemStack[] slots = this.getSlotsFromNBT(stack);
if(slots != null && slots.length > 0){ if(slots != null && slots.length > 0){
for(ItemStack slotStack : slots){ for(ItemStack slotStack : slots){
@ -86,8 +83,10 @@ public class ItemDrill extends ItemEnergy implements INameableItem{
if(this.getEnergyStored(stack) < this.getMaxEnergyStored(stack)){ if(this.getEnergyStored(stack) < this.getMaxEnergyStored(stack)){
int energy = ((IEnergyContainerItem)slotStack.getItem()).getEnergyStored(slotStack); int energy = ((IEnergyContainerItem)slotStack.getItem()).getEnergyStored(slotStack);
if(energy > 0){ if(energy > 0){
int received = ((IEnergyContainerItem)stack.getItem()).receiveEnergy(stack, energy, false); int toReceive = ((IEnergyContainerItem)stack.getItem()).receiveEnergy(stack, energy, true);
((IEnergyContainerItem)slotStack.getItem()).extractEnergy(slotStack, received, false); int actualReceive = ((IEnergyContainerItem)slotStack.getItem()).extractEnergy(slotStack, toReceive, false);
((IEnergyContainerItem)stack.getItem()).receiveEnergy(stack, actualReceive, false);
} }
} }
} }