diff --git a/src/main/java/crazypants/enderio/item/ItemMagnet.java b/src/main/java/crazypants/enderio/item/ItemMagnet.java index 187d5dcd..291774ef 100644 --- a/src/main/java/crazypants/enderio/item/ItemMagnet.java +++ b/src/main/java/crazypants/enderio/item/ItemMagnet.java @@ -132,11 +132,6 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP return res; } - void extractInternal(ItemStack item, int powerUse) { - int res = Math.max(0, getEnergyStored(item) - powerUse); - setEnergy(item, res); - } - void setEnergy(ItemStack container, int energy) { if(container.stackTagCompound == null) { container.stackTagCompound = new NBTTagCompound(); diff --git a/src/main/java/crazypants/enderio/item/MagnetController.java b/src/main/java/crazypants/enderio/item/MagnetController.java index e7e4cd5e..3ce5125f 100644 --- a/src/main/java/crazypants/enderio/item/MagnetController.java +++ b/src/main/java/crazypants/enderio/item/MagnetController.java @@ -5,6 +5,7 @@ import java.util.List; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; @@ -45,9 +46,13 @@ public class MagnetController implements IEntitySelector { player.posX - Config.magnetRange, player.posY - Config.magnetRange, player.posZ - Config.magnetRange, player.posX + Config.magnetRange, player.posY + Config.magnetRange, player.posZ + Config.magnetRange); - List interestingItems = player.worldObj.selectEntitiesWithinAABB(EntityItem.class, aabb, this); + List interestingItems = player.worldObj.selectEntitiesWithinAABB(EntityItem.class, aabb, this); + List xp = player.worldObj.selectEntitiesWithinAABB(EntityXPOrb.class, aabb, this); + if(xp != null) { + interestingItems.addAll(xp); + } - for (EntityItem entity : interestingItems) { + for (Entity entity : interestingItems) { double x = player.posX + 0.5D - entity.posX; double y = player.posY + 1D - entity.posY; double z = player.posZ + 0.5D - entity.posZ;