From dca3c28cca232dd3e475e28e07ae0e6c5703d92e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 17 Sep 2019 21:03:04 -0500 Subject: [PATCH] Diva charm no longer brainwashes boss mobs. Closes #2921 --- .../botania/common/item/equipment/bauble/ItemDivaCharm.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 9f2e9b20b..0a56f22bc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -56,7 +56,11 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @SubscribeEvent public void onEntityDamaged(LivingHurtEvent event) { - if (event.getSource().getImmediateSource() instanceof EntityPlayer && event.getEntityLiving() instanceof EntityLiving && !event.getEntityLiving().world.isRemote && Math.random() < 0.6F) { + if (event.getSource().getImmediateSource() instanceof EntityPlayer + && event.getEntityLiving() instanceof EntityLiving + && !event.getEntityLiving().world.isRemote + && event.getEntityLiving().isNonBoss() + && Math.random() < 0.6F) { Runnable lambda = () -> { EntityLiving target = (EntityLiving) event.getEntityLiving(); EntityPlayer player = (EntityPlayer) event.getSource().getImmediateSource();