diff options
| author | QAston <none@none> | 2009-05-13 18:33:15 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-05-13 18:33:15 +0200 |
| commit | 131c29f1329aa6ec696f51fbe2c75178dc8f8262 (patch) | |
| tree | 886fa69a8248b6b53eb7774944b35a8bf9bf5a3b /src/game/Unit.cpp | |
| parent | 9aab3899376258c09b7caab7743494495b6374a1 (diff) | |
| parent | 80c19013432ec49fb5c1b57bf2d5aca7be0d53c7 (diff) | |
*Merge.
--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 f142ea623a5..66576396dfa 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); |