diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 886da84b9..2e1b7c421 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -150,9 +150,6 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt public void onEquippedOrLoadedIntoWorld(ItemStack stack, EntityLivingBase player) {} - @Override - public void onUnequipped(ItemStack stack, EntityLivingBase player) {} - @Override public ItemStack getCosmeticItem(ItemStack stack) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_COSMETIC_ITEM, true); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 74a235e8d..3f7aec44c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -43,6 +43,9 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend @Override void fillModifiers(Multimap attributes, ItemStack stack) { + if(stack == null) // workaround for Azanor/Baubles#156 + return; + attributes.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 1, 0)); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 7a9f7fadf..7cd9f8734 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -120,6 +120,9 @@ public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordina private void fillModifiers(Multimap attributes, ItemStack stack) { + if(stack == null) // workaround for Azanor/Baubles#156 + return; + attributes.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index d58e40c23..95aef14c4 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -99,8 +99,10 @@ public class ItemOdinRing extends ItemRelicBauble { player.getAttributeMap().removeAttributeModifiers(attributes); } - void fillModifiers(Multimap attributes, ItemStack stack) { + if(stack == null) // workaround for Azanor/Baubles#156 + return; + attributes.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); }