From a80eb397d59aed9ced93fb401c8b6122c86c0ba6 Mon Sep 17 00:00:00 2001
From: af4t <kemmler.irreverent@gmail.com>
Date: Tue, 5 Mar 2013 15:44:05 -0500
Subject: [PATCH] Stop NPCs from aggroing each other with buffs/beneficial
 spells.

---
 changelog.txt   | 3 +++
 zone/spells.cpp | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 5543d8b75..eb6440f90 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,8 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 03/02/2013 ==
+af4t: Stop NPCs aggroing each other with buffs/beneficial spells.
+
 == 03/2/2013 ==
 Bad_Captain: Fixed Merc depop bug.
 Bad_Captain: Added merc rest regen.
diff --git a/zone/spells.cpp b/zone/spells.cpp
index 3878a154d..6d624bfae 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -3689,7 +3689,10 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	
 	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
+		return false;
+		
 	if(IsMezSpell(spell_id))
 	{
 		if(SpecAttacks[UNMEZABLE]) {