From d881601b2410ebafb59ce5540f3bf2a3bd016303 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 25 May 2014 20:47:06 +0100 Subject: [PATCH] The Terra Shatterer can no longer receive mana from aura rings. --- .../botania/common/item/equipment/tool/ItemTerraPick.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java index 5abdaf4e5..c42e75531 100644 --- a/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java +++ b/MODSRC/vazkii/botania/common/item/equipment/tool/ItemTerraPick.java @@ -33,6 +33,8 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.equipment.bauble.ItemAuraRing; +import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -208,7 +210,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem { @Override public boolean canReceiveManaFromItem(ItemStack stack, ItemStack otherStack) { - return true; + return !(stack.getItem() instanceof ItemAuraRing) && !(stack.getItem() instanceof ItemGreaterAuraRing); } @Override