aboutsummaryrefslogtreecommitdiff
path: root/src/game/Unit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/Unit.cpp')
-rw-r--r--src/game/Unit.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 6dcc96500cc..19ea4029cf8 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -9688,7 +9688,8 @@ void Unit::CombatStart(Unit* target)
target->SetStandState(PLAYER_STATE_NONE);
//Call creature group update
- if(GetTypeId()==TYPEID_UNIT && ((Creature *)this)->GetFormationID())
+ if(GetTypeId()==TYPEID_UNIT && ((Creature *)this)->GetFormationID() &&
+ CreatureGroupHolder.find(((Creature *)this)->GetFormationID()) != CreatureGroupHolder.end())
CreatureGroupHolder[((Creature *)this)->GetFormationID()]->MemberHasAttacked(((Creature *)this));
if(!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER