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

Fix the magnet ring using energy when not picking anything up

Browse source 
Closes #589
This commit is contained in:
Ellpeck 2017-01-30 18:44:29 +01:00
parent 2d4c7db2aa
commit 1b27148792
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,9 +52,12 @@ public class ItemMagnetRing extends ItemEnergy{
int energyForItem = 50*StackUtil.getStackSize(item.getEntityItem()); int energyForItem = 50*StackUtil.getStackSize(item.getEntityItem());
if(this.getEnergyStored(stack) >= energyForItem){ if(this.getEnergyStored(stack) >= energyForItem){
ItemStack oldItem = StackUtil.validateCopy(item.getEntityItem());
item.onCollideWithPlayer(player); item.onCollideWithPlayer(player);
if(!player.capabilities.isCreativeMode){ if(!player.capabilities.isCreativeMode){
if(item.isDead || !ItemStack.areItemStacksEqual(item.getEntityItem(), oldItem)){
this.extractEnergyInternal(stack, energyForItem, false); this.extractEnergyInternal(stack, energyForItem, false);
} }
} }
@ -64,6 +67,7 @@ public class ItemMagnetRing extends ItemEnergy{
} }
} }
} }
}
@Override @Override
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer player, EnumHand hand){ public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer player, EnumHand hand){