From 1acb837a332ee59fb815277dfcf9626cf55d5f8b Mon Sep 17 00:00:00 2001
From: Trazom62 <none@none>
Date: Wed, 5 May 2010 13:58:25 +0200
Subject: Fix crash in CreatureGroup::MemberAttackStart. Fixes issue #1982.

--HG--
branch : trunk
---
 src/game/CreatureGroups.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/game/CreatureGroups.cpp b/src/game/CreatureGroups.cpp
index 911b6d625af..c2af59458f7 100644
--- a/src/game/CreatureGroups.cpp
+++ b/src/game/CreatureGroups.cpp
@@ -186,8 +186,8 @@ void CreatureGroup::MemberAttackStart(Creature *member, Unit *target)
 
     for (CreatureGroupMemberType::iterator itr = m_members.begin(); itr != m_members.end(); ++itr)
     {
-        sLog.outDebug("GROUP ATTACK: group instance id %u calls member instid %u", m_leader->GetInstanceId(), member->GetInstanceId());
-        //sLog.outDebug("AI:%u:Group member found: %u, attacked by %s.", groupAI, itr->second->GetGUIDLow(), member->getVictim()->GetName());
+        if (m_leader) // avoid crash if leader was killed and reset.
+            sLog.outDebug("GROUP ATTACK: group instance id %u calls member instid %u", m_leader->GetInstanceId(), member->GetInstanceId());
 
         //Skip one check
         if (itr->first == member)
@@ -199,7 +199,7 @@ void CreatureGroup::MemberAttackStart(Creature *member, Unit *target)
         if (itr->first->getVictim())
             continue;
 
-        if (itr->first->canAttack(target))
+        if (itr->first->canAttack(target) && itr->first->AI())
             itr->first->AI()->AttackStart(target);
     }
 }
-- 
cgit v1.2.3