From 1b27148792e59f5b083df3f80d8d7c68b7d66f99 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 30 Jan 2017 18:44:29 +0100 Subject: [PATCH] Fix the magnet ring using energy when not picking anything up Closes #589 --- .../ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java index 58110af13..8286819ab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMagnetRing.java @@ -52,10 +52,14 @@ public class ItemMagnetRing extends ItemEnergy{ int energyForItem = 50*StackUtil.getStackSize(item.getEntityItem()); if(this.getEnergyStored(stack) >= energyForItem){ + ItemStack oldItem = StackUtil.validateCopy(item.getEntityItem()); + item.onCollideWithPlayer(player); if(!player.capabilities.isCreativeMode){ - this.extractEnergyInternal(stack, energyForItem, false); + if(item.isDead || !ItemStack.areItemStacksEqual(item.getEntityItem(), oldItem)){ + this.extractEnergyInternal(stack, energyForItem, false); + } } } }