From ab816d2ebe76e15475f580f729e7af42cf0534d4 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 15:35:37 +0200 Subject: [PATCH 01/10] avoid checking for other players for every item if alone --- .../github/inventory/item/WirelessMagnet.java | 49 +++++++++++-------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index 08ac0b09..5be4338e 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -64,30 +64,35 @@ public class WirelessMagnet { (int) player.posZ, magnetRange).iterator(); + final boolean skipPlayerCheck = world.playerEntities.size() < 2; + while (iterator.hasNext()) { EntityItem itemToGet = (EntityItem) iterator.next(); - EntityPlayer closestPlayer = world.getClosestPlayerToEntity(itemToGet, magnetRange); - if (closestPlayer != null && closestPlayer == player) { - NBTTagCompound itemNBT = new NBTTagCompound(); - itemToGet.writeEntityToNBT(itemNBT); + if (!skipPlayerCheck) { + EntityPlayer closestPlayer = world.getClosestPlayerToEntity(itemToGet, magnetRange); + if (closestPlayer == null || closestPlayer != player) continue; + } - if (itemToGet.func_145800_j() == null - || !itemToGet.func_145800_j().equals(player.getCommandSenderName())) - itemToGet.delayBeforeCanPickup = 0; + NBTTagCompound itemNBT = new NBTTagCompound(); + itemToGet.writeEntityToNBT(itemNBT); - if (itemToGet.delayBeforeCanPickup <= 0) { - itemNBT.setBoolean("attractable", true); - itemToGet.readEntityFromNBT(itemNBT); - } + if (itemToGet.func_145800_j() == null + || !itemToGet.func_145800_j().equals(player.getCommandSenderName())) { + itemToGet.delayBeforeCanPickup = 0; + } - if (itemNBT.getBoolean("attractable")) { - itemToGet.motionX = itemToGet.motionY = itemToGet.motionZ = 0; - itemToGet.setPosition( - player.posX - 0.2 + (world.rand.nextDouble() * 0.4), - player.posY - 0.6, - player.posZ - 0.2 + (world.rand.nextDouble() * 0.4)); - } + if (itemToGet.delayBeforeCanPickup <= 0) { + itemNBT.setBoolean("attractable", true); + itemToGet.readEntityFromNBT(itemNBT); + } + + if (itemNBT.getBoolean("attractable")) { + itemToGet.motionX = itemToGet.motionY = itemToGet.motionZ = 0; + itemToGet.setPosition( + player.posX - 0.2 + (world.rand.nextDouble() * 0.4), + player.posY - 0.6, + player.posZ - 0.2 + (world.rand.nextDouble() * 0.4)); } } @@ -101,9 +106,13 @@ public class WirelessMagnet { magnetRange).iterator(); while (iterator.hasNext()) { EntityXPOrb xpToGet = (EntityXPOrb) iterator.next(); - EntityPlayer closestPlayer = world.getClosestPlayerToEntity(xpToGet, magnetRange); - if (!xpToGet.isDead && !xpToGet.isInvisible() && closestPlayer != null && closestPlayer == player) { + if (xpToGet.field_70532_c == 0 && xpToGet.isEntityAlive()) { + if (!skipPlayerCheck) { + EntityPlayer closestPlayer = world.getClosestPlayerToEntity(xpToGet, magnetRange); + if (closestPlayer == null || closestPlayer != player) continue; + } + int xpAmount = xpToGet.xpValue; xpToGet.xpValue = 0; player.xpCooldown = 0; From 25ee628e7fa292187092fcabd8711a7f888ccc82 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 16:23:01 +0200 Subject: [PATCH 02/10] only run magnet logic every 5 ticks --- .../com/glodblock/github/inventory/item/WirelessMagnet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index 5be4338e..ad234eb3 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -54,7 +54,7 @@ public class WirelessMagnet { } public static void doMagnet(ItemStack wirelessTerm, World world, EntityPlayer player) { - if (wirelessTerm == null || player == null || player.isSneaking() || !isConfigured(wirelessTerm)) return; + if (wirelessTerm == null || player == null || player.ticksExisted % 5 != 0 || player.isSneaking() || !isConfigured(wirelessTerm)) return; Iterator iterator = getEntitiesInRange( EntityItem.class, From cc3ed577902f960d6df9254824dc9cdcbc06eaed Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 16:34:17 +0200 Subject: [PATCH 03/10] delete NBTTagCompound hallucination --- .../github/inventory/item/WirelessMagnet.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index ad234eb3..062ba193 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -46,8 +46,6 @@ public class WirelessMagnet { z + distance)); } - @SuppressWarnings("unchecked") - public static boolean isConfigured(ItemStack wirelessTerm) { NBTTagCompound data = Platform.openNbtData(wirelessTerm); return data.hasKey(modeKey); @@ -74,21 +72,14 @@ public class WirelessMagnet { if (closestPlayer == null || closestPlayer != player) continue; } - NBTTagCompound itemNBT = new NBTTagCompound(); - itemToGet.writeEntityToNBT(itemNBT); - - if (itemToGet.func_145800_j() == null - || !itemToGet.func_145800_j().equals(player.getCommandSenderName())) { + if (itemToGet.func_145800_j() == null || !itemToGet.func_145800_j().equals(player.getCommandSenderName())) { itemToGet.delayBeforeCanPickup = 0; } if (itemToGet.delayBeforeCanPickup <= 0) { - itemNBT.setBoolean("attractable", true); - itemToGet.readEntityFromNBT(itemNBT); - } - - if (itemNBT.getBoolean("attractable")) { - itemToGet.motionX = itemToGet.motionY = itemToGet.motionZ = 0; + itemToGet.motionX = 0; + itemToGet.motionY = 0; + itemToGet.motionZ = 0; itemToGet.setPosition( player.posX - 0.2 + (world.rand.nextDouble() * 0.4), player.posY - 0.6, From 42616147aa5a2a4e1fad4c0170e1f267195fee05 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 17:05:19 +0200 Subject: [PATCH 04/10] change while loops to for loops and correct the generic method signature --- .../github/inventory/item/WirelessMagnet.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index 062ba193..fb089b18 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -2,7 +2,6 @@ package com.glodblock.github.inventory.item; import static com.glodblock.github.common.Config.magnetRange; -import java.util.Iterator; import java.util.List; import net.minecraft.entity.item.EntityItem; @@ -34,7 +33,7 @@ public class WirelessMagnet { BlackList } - public static List getEntitiesInRange(Class entityType, World world, int x, int y, int z, int distance) { + private static List getEntitiesInRange(Class entityType, World world, int x, int y, int z, int distance) { return world.getEntitiesWithinAABB( entityType, AxisAlignedBB.getBoundingBox( @@ -54,19 +53,16 @@ public class WirelessMagnet { public static void doMagnet(ItemStack wirelessTerm, World world, EntityPlayer player) { if (wirelessTerm == null || player == null || player.ticksExisted % 5 != 0 || player.isSneaking() || !isConfigured(wirelessTerm)) return; - Iterator iterator = getEntitiesInRange( + final List items = getEntitiesInRange( EntityItem.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, - magnetRange).iterator(); - + magnetRange); final boolean skipPlayerCheck = world.playerEntities.size() < 2; - while (iterator.hasNext()) { - EntityItem itemToGet = (EntityItem) iterator.next(); - + for (EntityItem itemToGet : items) { if (!skipPlayerCheck) { EntityPlayer closestPlayer = world.getClosestPlayerToEntity(itemToGet, magnetRange); if (closestPlayer == null || closestPlayer != player) continue; @@ -88,16 +84,15 @@ public class WirelessMagnet { } // xp - iterator = getEntitiesInRange( + final List xpOrbs = getEntitiesInRange( EntityXPOrb.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, - magnetRange).iterator(); - while (iterator.hasNext()) { - EntityXPOrb xpToGet = (EntityXPOrb) iterator.next(); + magnetRange); + for (EntityXPOrb xpToGet : xpOrbs) { if (xpToGet.field_70532_c == 0 && xpToGet.isEntityAlive()) { if (!skipPlayerCheck) { EntityPlayer closestPlayer = world.getClosestPlayerToEntity(xpToGet, magnetRange); From 8aa0eddb24961aa75c30056525b095b73d04d88c Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 17:09:57 +0200 Subject: [PATCH 05/10] fire the PlayerPickupXpEvent --- .../github/inventory/item/WirelessMagnet.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index fb089b18..40f736db 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -11,6 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; import com.glodblock.github.common.item.ItemWirelessUltraTerminal; @@ -99,17 +101,15 @@ public class WirelessMagnet { if (closestPlayer == null || closestPlayer != player) continue; } - int xpAmount = xpToGet.xpValue; - xpToGet.xpValue = 0; - player.xpCooldown = 0; - player.addExperience(xpAmount); - xpToGet.setDead(); - xpToGet.setInvisible(true); + if (MinecraftForge.EVENT_BUS.post(new PlayerPickupXpEvent(player, xpToGet))) continue; world.playSoundAtEntity( player, "random.orb", - 0.08F, + 0.1F, 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F)); + player.onItemPickup(xpToGet, 1); + player.addExperience(xpToGet.xpValue); + xpToGet.setDead(); } } } From dd0554ce644820992e6ebada71646420d89afc95 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 17:13:21 +0200 Subject: [PATCH 06/10] play a sound when picking up items --- .../github/inventory/item/WirelessMagnet.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index 40f736db..17aca745 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -63,6 +63,7 @@ public class WirelessMagnet { (int) player.posZ, magnetRange); final boolean skipPlayerCheck = world.playerEntities.size() < 2; + boolean playSound = false; for (EntityItem itemToGet : items) { if (!skipPlayerCheck) { @@ -75,6 +76,7 @@ public class WirelessMagnet { } if (itemToGet.delayBeforeCanPickup <= 0) { + playSound = true; itemToGet.motionX = 0; itemToGet.motionY = 0; itemToGet.motionZ = 0; @@ -85,6 +87,14 @@ public class WirelessMagnet { } } + if (playSound) { + world.playSoundAtEntity( + player, + "random.orb", + 0.1F, + 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 2F)); + } + // xp final List xpOrbs = getEntitiesInRange( EntityXPOrb.class, From 1591a73c38ec474b301f59f83b38b53a56cd1e56 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 17:15:54 +0200 Subject: [PATCH 07/10] teleport items on the clientside as well --- .../item/ItemWirelessUltraTerminal.java | 4 +- .../github/inventory/item/WirelessMagnet.java | 53 ++++++++++--------- 2 files changed, 30 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index 828a8b5b..c6001b01 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -274,9 +274,9 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal @Override public void onUpdate(ItemStack stack, World worldIn, Entity entityIn, int slot, boolean p_77663_5_) { - if (Platform.isServer() && entityIn instanceof EntityPlayer player) { + if (entityIn instanceof EntityPlayer player) { if (WirelessMagnet.getMode(stack) != WirelessMagnet.Mode.Off) { - WirelessMagnet.doMagnet(stack, player.worldObj, player); + WirelessMagnet.doMagnet(stack, player); } } } diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index 17aca745..692feca1 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -52,9 +52,10 @@ public class WirelessMagnet { return data.hasKey(modeKey); } - public static void doMagnet(ItemStack wirelessTerm, World world, EntityPlayer player) { - if (wirelessTerm == null || player == null || player.ticksExisted % 5 != 0 || player.isSneaking() || !isConfigured(wirelessTerm)) return; + public static void doMagnet(ItemStack wirelessTerm, EntityPlayer player) { + if (player.ticksExisted % 5 != 0 || player.isSneaking() || !isConfigured(wirelessTerm)) return; + World world = player.worldObj; final List items = getEntitiesInRange( EntityItem.class, world, @@ -95,31 +96,33 @@ public class WirelessMagnet { 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 2F)); } - // xp - final List xpOrbs = getEntitiesInRange( - EntityXPOrb.class, - world, - (int) player.posX, - (int) player.posY, - (int) player.posZ, - magnetRange); + if (!world.isRemote) { + // xp + final List xpOrbs = getEntitiesInRange( + EntityXPOrb.class, + world, + (int) player.posX, + (int) player.posY, + (int) player.posZ, + magnetRange); - for (EntityXPOrb xpToGet : xpOrbs) { - if (xpToGet.field_70532_c == 0 && xpToGet.isEntityAlive()) { - if (!skipPlayerCheck) { - EntityPlayer closestPlayer = world.getClosestPlayerToEntity(xpToGet, magnetRange); - if (closestPlayer == null || closestPlayer != player) continue; + for (EntityXPOrb xpToGet : xpOrbs) { + if (xpToGet.field_70532_c == 0 && xpToGet.isEntityAlive()) { + if (!skipPlayerCheck) { + EntityPlayer closestPlayer = world.getClosestPlayerToEntity(xpToGet, magnetRange); + if (closestPlayer == null || closestPlayer != player) continue; + } + + if (MinecraftForge.EVENT_BUS.post(new PlayerPickupXpEvent(player, xpToGet))) continue; + world.playSoundAtEntity( + player, + "random.orb", + 0.1F, + 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F)); + player.onItemPickup(xpToGet, 1); + player.addExperience(xpToGet.xpValue); + xpToGet.setDead(); } - - if (MinecraftForge.EVENT_BUS.post(new PlayerPickupXpEvent(player, xpToGet))) continue; - world.playSoundAtEntity( - player, - "random.orb", - 0.1F, - 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F)); - player.onItemPickup(xpToGet, 1); - player.addExperience(xpToGet.xpValue); - xpToGet.setDead(); } } } From 08bffd9d50ee6d52fde0e3c5a6d40c99adbd8394 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 17:23:47 +0200 Subject: [PATCH 08/10] cache Enum.values() call for WirelessMagnet.Mode enum --- .../github/inventory/item/BaseWirelessInventory.java | 7 +++---- .../github/inventory/item/WirelessMagnet.java | 11 +++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java b/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java index 55b16174..207313e2 100644 --- a/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java @@ -71,7 +71,7 @@ public abstract class BaseWirelessInventory extends MEMonitorHandler implements private void readFromNBT() { NBTTagCompound data = Platform.openNbtData(this.target); - this.setMagnetCardMode(WirelessMagnet.Mode.values()[data.getInteger(modeKey)]); + this.setMagnetCardMode(WirelessMagnet.Mode.getModes()[data.getInteger(modeKey)]); this.setRestock(data.getBoolean(ItemBaseWirelessTerminal.restockItems)); } @@ -137,9 +137,8 @@ public abstract class BaseWirelessInventory extends MEMonitorHandler implements } public void setMagnetCardNextMode() { - setMagnetCardMode( - WirelessMagnet.Mode.values()[(getMagnetCardMode().ordinal() + 1) - % WirelessMagnet.Mode.values().length]); + final WirelessMagnet.Mode[] MODES = WirelessMagnet.Mode.getModes(); + setMagnetCardMode(MODES[(getMagnetCardMode().ordinal() + 1) % MODES.length]); } public void setRestock(boolean val) { diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index 692feca1..aa0375f4 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -25,9 +25,16 @@ public class WirelessMagnet { public static String filterConfigKey = "MagnetConfig"; public enum Mode { + Off, Inv, - ME + ME; + + private static final Mode[] MODES = Mode.values(); + + public static Mode[] getModes() { + return MODES; + } } public enum ListMode { @@ -131,7 +138,7 @@ public class WirelessMagnet { if (is != null && is.getItem() instanceof ItemWirelessUltraTerminal) { NBTTagCompound data = Platform.openNbtData(is); if (data.hasKey(modeKey)) { - return Mode.values()[data.getInteger(modeKey)]; + return Mode.getModes()[data.getInteger(modeKey)]; } setMode(is, Mode.Off); } From d5cb385fc1c4d9400bfe3a65b885aa5adc1b799e Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 17:42:04 +0200 Subject: [PATCH 09/10] remove check who dropped the item --- .../github/inventory/item/WirelessMagnet.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index aa0375f4..599b48ca 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -79,20 +79,17 @@ public class WirelessMagnet { if (closestPlayer == null || closestPlayer != player) continue; } - if (itemToGet.func_145800_j() == null || !itemToGet.func_145800_j().equals(player.getCommandSenderName())) { + if (itemToGet.delayBeforeCanPickup > 0) { itemToGet.delayBeforeCanPickup = 0; } - - if (itemToGet.delayBeforeCanPickup <= 0) { - playSound = true; - itemToGet.motionX = 0; - itemToGet.motionY = 0; - itemToGet.motionZ = 0; - itemToGet.setPosition( - player.posX - 0.2 + (world.rand.nextDouble() * 0.4), - player.posY - 0.6, - player.posZ - 0.2 + (world.rand.nextDouble() * 0.4)); - } + playSound = true; + itemToGet.motionX = 0; + itemToGet.motionY = 0; + itemToGet.motionZ = 0; + itemToGet.setPosition( + player.posX - 0.2 + (world.rand.nextDouble() * 0.4), + player.posY - 0.6, + player.posZ - 0.2 + (world.rand.nextDouble() * 0.4)); } if (playSound) { From 01865afd107358295ac991fcb8abdaf78224d4b5 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 4 Jun 2025 17:43:52 +0200 Subject: [PATCH 10/10] don't magnet fake entity items from ME assemblers --- .../com/glodblock/github/inventory/item/WirelessMagnet.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java index 599b48ca..bf35550e 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -16,6 +16,7 @@ import net.minecraftforge.event.entity.player.PlayerPickupXpEvent; import com.glodblock.github.common.item.ItemWirelessUltraTerminal; +import appeng.entity.EntityFloatingItem; import appeng.util.Platform; public class WirelessMagnet { @@ -74,6 +75,10 @@ public class WirelessMagnet { boolean playSound = false; for (EntityItem itemToGet : items) { + if (itemToGet.getEntityItem() == null || itemToGet instanceof EntityFloatingItem) { + continue; + } + if (!skipPlayerCheck) { EntityPlayer closestPlayer = world.getClosestPlayerToEntity(itemToGet, magnetRange); if (closestPlayer == null || closestPlayer != player) continue;