diff --git a/zone/bot.cpp b/zone/bot.cpp
index b7e41a25b..6fd086f64 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -9652,6 +9652,21 @@ bool Bot::CastChecks(uint16 spell_id, Mob* tar, uint16 spellType, bool doPrechec
 		return false;
 	}
 
+	if (tar->GetSpecialAbility(SpecialAbility::MagicImmunity)) {
+		LogBotPreChecksDetail("{} says, 'Cancelling cast of {} on {} due to MagicImmunity.'", GetCleanName(), GetSpellName(spell_id), tar->GetCleanName()); //deleteme
+		return false;
+	}
+
+	if (tar->GetSpecialAbility(SpecialAbility::CastingFromRangeImmunity) && !CombatRange(tar)) {
+		LogBotPreChecksDetail("{} says, 'Cancelling cast of {} on {} due to CastingFromRangeImmunity.'", GetCleanName(), GetSpellName(spell_id), tar->GetCleanName()); //deleteme
+		return false;
+	}
+
+	if (tar->IsImmuneToBotSpell(spell_id, this)) {
+		LogBotPreChecksDetail("{} says, 'Cancelling cast of {} on {} due to IsImmuneToBotSpell.'", GetCleanName(), GetSpellName(spell_id), tar->GetCleanName()); //deleteme
+		return false;
+	}
+
 	if (!AECheck && !IsValidSpellRange(spell_id, tar)) {
 		LogBotPreChecksDetail("{} says, 'Cancelling cast of {} on {} due to IsValidSpellRange.'", GetCleanName(), GetSpellName(spell_id), tar->GetCleanName()); //deleteme
 		return false;
@@ -9675,16 +9690,6 @@ bool Bot::CastChecks(uint16 spell_id, Mob* tar, uint16 spellType, bool doPrechec
 		LogBotPreChecksDetail("{} says, 'Cancelling cast of {} on {} due to IsValidTargetType.'", GetCleanName(), GetSpellName(spell_id), tar->GetCleanName()); //deleteme
 		return false;
 	}
-
-	if (tar->GetSpecialAbility(SpecialAbility::CastingFromRangeImmunity) && !CombatRange(tar)) {
-		LogBotPreChecksDetail("{} says, 'Cancelling cast of {} on {} due to IMMUNE_CASTING_FROM_RANGE.'", GetCleanName(), GetSpellName(spell_id), tar->GetCleanName()); //deleteme
-		return false;
-	}
-
-	if (tar->IsImmuneToBotSpell(spell_id, this)) {
-		LogBotPreChecksDetail("{} says, 'Cancelling cast of {} on {} due to IsImmuneToBotSpell.'", GetCleanName(), GetSpellName(spell_id), tar->GetCleanName()); //deleteme
-		return false;
-	}
 	
 	if (
 		(RequiresStackCheck(spellType) || (!RequiresStackCheck(spellType) && CalcBuffDuration(this, tar, spell_id) != 0))
diff --git a/zone/botspellsai.cpp b/zone/botspellsai.cpp
index 835e99040..d1eb10ecd 100644
--- a/zone/botspellsai.cpp
+++ b/zone/botspellsai.cpp
@@ -207,7 +207,7 @@ bool Bot::AICastSpell(Mob* tar, uint8 iChance, uint16 spellType, uint16 subTarge
 
 			break;
 		case BotSpellTypes::Charm:
-			if (tar->IsCharmed() || !tar->IsNPC() || tar->GetSpecialAbility(SpecialAbility::CharmImmunity)) {
+			if (HasPet() || tar->IsCharmed() || !tar->IsNPC() || tar->GetSpecialAbility(SpecialAbility::CharmImmunity)) {
 				return false;
 			}
 
@@ -596,27 +596,6 @@ bool Bot::AIDoSpellCast(int32 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgain
 	} else
 		dist2 = DistanceSquared(m_Position, tar->GetPosition());
 
-	//if (
-	//	(
-	//		(
-	//			(
-	//				(spells[AIBot_spells[i].spellid].target_type==ST_GroupTeleport && AIBot_spells[i].type == BotSpellTypes::RegularHeal) ||
-	//				spells[AIBot_spells[i].spellid].target_type ==ST_AECaster ||
-	//				spells[AIBot_spells[i].spellid].target_type ==ST_Group ||
-	//				spells[AIBot_spells[i].spellid].target_type ==ST_AEBard ||
-	//				(
-	//					tar == this && spells[AIBot_spells[i].spellid].target_type != ST_TargetsTarget
-	//				)
-	//			) &&
-	//			dist2 <= spells[AIBot_spells[i].spellid].aoe_range*spells[AIBot_spells[i].spellid].aoe_range
-	//		) ||
-	//		dist2 <= GetActSpellRange(AIBot_spells[i].spellid, spells[AIBot_spells[i].spellid].range)*GetActSpellRange(AIBot_spells[i].spellid, spells[AIBot_spells[i].spellid].range)
-	//	) &&
-	//	(
-	//		mana_cost <= GetMana() ||
-	//		IsBotNonSpellFighter()
-	//	)
-	//) {
 	if (IsValidSpellRange(AIBot_spells[i].spellid, tar) && (mana_cost <= GetMana() || IsBotNonSpellFighter())) {
 		casting_spell_AIindex = i;
 		LogAI("spellid [{}] tar [{}] mana [{}] Name [{}]", AIBot_spells[i].spellid, tar->GetName(), mana_cost, spells[AIBot_spells[i].spellid].name);
diff --git a/zone/spells.cpp b/zone/spells.cpp
index 9bc775aa3..bce05ecd1 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -7561,8 +7561,9 @@ bool Mob::IsImmuneToBotSpell(uint16 spell_id, Mob* caster)
 {
 	int effect_index;
 
-	if (caster == nullptr)
+	if (caster == nullptr) {
 		return(false);
+	}
 
 	//TODO: this function loops through the effect list for
 	//this spell like 10 times, this could easily be consolidated
@@ -7570,14 +7571,19 @@ bool Mob::IsImmuneToBotSpell(uint16 spell_id, Mob* caster)
 
 	LogSpells("Checking to see if we are immune to spell [{}] cast by [{}]", spell_id, caster->GetName());
 
-	if (!IsValidSpell(spell_id))
+	if (!IsValidSpell(spell_id)) {
 		return true;
+	}
 
-	if (IsBeneficialSpell(spell_id) && (caster->GetNPCTypeID())) //then skip the rest, stop NPCs aggroing each other with buff spells. 2013-03-05
+	if (IsDispelSpell(spell_id) && GetSpecialAbility(SpecialAbility::DispellImmunity)) {
 		return false;
+	}
 
-	if (IsMesmerizeSpell(spell_id))
-	{
+	if (IsHarmonySpell(spell_id) && GetSpecialAbility(SpecialAbility::PacifyImmunity)) {
+		return false;
+	}
+
+	if (IsMesmerizeSpell(spell_id)) {
 		if (GetSpecialAbility(SpecialAbility::MesmerizeImmunity)) {
 			return true;
 		}
@@ -7586,90 +7592,76 @@ bool Mob::IsImmuneToBotSpell(uint16 spell_id, Mob* caster)
 		effect_index = GetSpellEffectIndex(spell_id, SE_Mez);
 		assert(effect_index >= 0);
 		// NPCs get to ignore the max level
-		if ((GetLevel() > spells[spell_id].max_value[effect_index]) &&
-			(!caster->IsNPC() || (caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity))))
-		{
+		if (
+			(GetLevel() > spells[spell_id].max_value[effect_index]) &&
+			(!caster->IsNPC() || (caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity)))
+		)  {
 			return true;
 		}
 	}
 
 	// slow and haste spells
-	if (GetSpecialAbility(SpecialAbility::SlowImmunity) && IsEffectInSpell(spell_id, SE_AttackSpeed))
-	{
+	if (GetSpecialAbility(SpecialAbility::SlowImmunity) && IsEffectInSpell(spell_id, SE_AttackSpeed)) {
 		return true;
 	}
 
 	// client vs client fear
-	if (IsEffectInSpell(spell_id, SE_Fear))
-	{
+	if (IsEffectInSpell(spell_id, SE_Fear)) {
 		effect_index = GetSpellEffectIndex(spell_id, SE_Fear);
+
 		if (GetSpecialAbility(SpecialAbility::FearImmunity)) {
 			return true;
 		}
-		else if (IsClient() && caster->IsClient() && (caster->CastToClient()->GetGM() == false))
-		{
+		else if (IsClient() && caster->IsClient() && (caster->CastToClient()->GetGM() == false)) {
 			LogSpells("Clients cannot fear eachother!");
 			caster->MessageString(Chat::Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
 			return true;
 		}
-		else if (GetLevel() > spells[spell_id].max_value[effect_index] && spells[spell_id].max_value[effect_index] != 0)
-		{
+		else if (GetLevel() > spells[spell_id].max_value[effect_index] && spells[spell_id].max_value[effect_index] != 0) {
 			return true;
 		}
-		else if (CheckAATimer(aaTimerWarcry))
-		{
+		else if (CheckAATimer(aaTimerWarcry)) {
 			return true;
 		}
 	}
 
-	if (IsCharmSpell(spell_id))
-	{
-		if (GetSpecialAbility(SpecialAbility::CharmImmunity))
-		{
+	if (IsCharmSpell(spell_id))	{
+		if (GetSpecialAbility(SpecialAbility::CharmImmunity)) {
 			return true;
 		}
 
-		if (this == caster)
-		{
+		if (this == caster) {
 			return true;
 		}
 
 		//let npcs cast whatever charm on anyone
-		if (!caster->IsNPC())
-		{
+		if (!caster->IsNPC()) {
 			// check level limit of charm spell
 			effect_index = GetSpellEffectIndex(spell_id, SE_Charm);
 			assert(effect_index >= 0);
-			if (GetLevel() > spells[spell_id].max_value[effect_index] && spells[spell_id].max_value[effect_index] != 0)
-			{
+			if (GetLevel() > spells[spell_id].max_value[effect_index] && spells[spell_id].max_value[effect_index] != 0) {
 				return true;
 			}
 		}
 	}
 
-	if
-		(
-			IsEffectInSpell(spell_id, SE_Root) ||
-			IsEffectInSpell(spell_id, SE_MovementSpeed)
-			)
-	{
+	if (
+		IsEffectInSpell(spell_id, SE_Root) ||
+		IsEffectInSpell(spell_id, SE_MovementSpeed)
+	) {
 		if (GetSpecialAbility(SpecialAbility::SnareImmunity)) {
 			return true;
 		}
 	}
 
-	if (IsLifetapSpell(spell_id))
-	{
-		if (this == caster)
-		{
+	if (IsLifetapSpell(spell_id)) {
+		if (this == caster) {
 			return true;
 		}
 	}
 
-	if (IsSacrificeSpell(spell_id))
-	{
-		if (this == caster)
-		{
+	if (IsSacrificeSpell(spell_id)) {
+		if (this == caster) {
 			return true;
 		}
 	}