From cff5edcd21781119a4eaac201b2183579ff7c861 Mon Sep 17 00:00:00 2001 From: Hubry Date: Fri, 1 Feb 2019 17:44:00 +0100 Subject: [PATCH] Make magnet ring respect pickup delays and tweak blacklist (#2799) * Items with pickup delay >40 ticks will be ignored * Ignore AE2 seeds with their changed name * Make the blacklist actually usable and not crash when added to with IMC --- .../common/item/equipment/bauble/ItemMagnetRing.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 6f2c1f607..1a6be9bc2 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 @@ -12,7 +12,7 @@ package vazkii.botania.common.item.equipment.bauble; import baubles.api.BaubleType; import baubles.api.BaublesApi; -import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; @@ -41,7 +41,7 @@ public class ItemMagnetRing extends ItemBauble { private static final String TAG_COOLDOWN = "cooldown"; - private static final List BLACKLIST = ImmutableList.of(new ResourceLocation("appliedenergistics2", "item.ItemCrystalSeed")); + private static final List BLACKLIST = Lists.newArrayList(new ResourceLocation("appliedenergistics2", "crystal_seed")); private final int range; @@ -105,7 +105,7 @@ public class ItemMagnetRing extends ItemBauble { } private boolean canPullItem(EntityItem item) { - if(item.isDead || SubTileSolegnolia.hasSolegnoliaAround(item)) + if(item.isDead || item.pickupDelay >= 40 || SubTileSolegnolia.hasSolegnoliaAround(item)) return false; ItemStack stack = item.getItem();