mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-17 02:45:08 +00:00
Merge remote-tracking branch 'origin/magnet' into dev
This commit is contained in:
1 file changed
+6
-2
@@ -60,9 +60,10 @@ 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;
|
||||
final List<EntityItem> items = getEntitiesInRange(
|
||||
EntityItem.class,
|
||||
@@ -91,9 +92,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));
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user