From 3495179f0e7dcefa4e5a0588768c41b224f73834 Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Sun, 8 Jun 2025 21:33:12 +0200 Subject: [PATCH 1/2] account for client /server desync when teleporting items with magnet --- .../com/glodblock/github/inventory/item/WirelessMagnet.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 bf35550e..f88c4d0f 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -62,7 +62,6 @@ public class WirelessMagnet { 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, @@ -91,9 +90,12 @@ public class WirelessMagnet { itemToGet.motionX = 0; itemToGet.motionY = 0; itemToGet.motionZ = 0; + // account for the server/client desync + double playerEyesPos = player.posY + + (world.isRemote ? player.getEyeHeight() - player.getDefaultEyeHeight() : player.getEyeHeight()); itemToGet.setPosition( player.posX - 0.2 + (world.rand.nextDouble() * 0.4), - player.posY - 0.6, + playerEyesPos - 0.62, player.posZ - 0.2 + (world.rand.nextDouble() * 0.4)); } From e6b9d1a6c2a04a045b06c53f7ecaa458d69f5dfa Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Sun, 8 Jun 2025 21:54:08 +0200 Subject: [PATCH 2/2] add comment --- .../com/glodblock/github/inventory/item/WirelessMagnet.java | 2 ++ 1 file changed, 2 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 f88c4d0f..0678e423 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnet.java @@ -60,6 +60,8 @@ public class WirelessMagnet { return data.hasKey(modeKey); } + // This method uses the same algorithm as the magnet from draconic evolution + // if changes are ever made, they should be made on both public static void doMagnet(ItemStack wirelessTerm, EntityPlayer player) { if (player.ticksExisted % 5 != 0 || player.isSneaking() || !isConfigured(wirelessTerm)) return; World world = player.worldObj;