diff options
| author | megamage <none@none> | 2009-05-13 10:52:55 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-05-13 10:52:55 -0500 |
| commit | f1fed2d9472e8f9cb4cd2f7d570006d0bf3cfabe (patch) | |
| tree | 9779271f58b912341bacb54125e4e55062bad363 /src/game/Unit.cpp | |
| parent | a635613285c51029b05c79dc9527402257ec7ef1 (diff) | |
*Allow passive unit to call entercombat function.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Unit.cpp')
| -rw-r--r-- | src/game/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 95547b68621..259140a74de 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9958,7 +9958,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy) ((Creature*)this)->SetHomePosition(GetPositionX(), GetPositionY(), GetPositionZ(), GetOrientation()); if(enemy) { - if(!((Creature*)this)->HasReactState(REACT_PASSIVE) && ((Creature*)this)->IsAIEnabled) + if(((Creature*)this)->IsAIEnabled) ((Creature*)this)->AI()->EnterCombat(enemy); if(((Creature*)this)->GetFormation()) ((Creature*)this)->GetFormation()->MemberAttackStart((Creature*)this, enemy); |