From 8dafb55237ef5ac9f2d9ac2411606fc9be7d36ba Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Sep 2015 22:58:14 +0100 Subject: [PATCH] The Ring of Magnetism now has a limit of 200 entities it can pull. Closes #1384 --- .../botania/common/item/equipment/bauble/ItemMagnetRing.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 92833be12..4bd0edce7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -99,13 +99,18 @@ public class ItemMagnetRing extends ItemBauble { double z = player.posZ; List items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range, y + range, z + range)); + int pulled = 0; for(EntityItem item : items) if(canPullItem(item)) { + if(pulled > 200) + break; + MathHelper.setEntityMotionFromVector(item, new Vector3(x, y, z), 0.45F); if(player.worldObj.isRemote) { boolean red = player.worldObj.rand.nextBoolean(); Botania.proxy.sparkleFX(player.worldObj, item.posX, item.posY, item.posZ, red ? 1F : 0F, 0F, red ? 0F : 1F, 1F, 3); } + pulled++; } } } else setCooldown(stack, cooldown - 1);