diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-12-22 09:23:55 -0800 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-12-22 09:23:55 -0800 |
| commit | 3f4c6a9d45a5994bbf5d1dff42038cd3ab6f3535 (patch) | |
| tree | 7486d9353e456c3f35b527e19561c458fcbf97ec | |
| parent | 2302b04a063e79988fb8fae0c0c595c5fc5c8a55 (diff) | |
| parent | 09204f15347a4a0988e9acb8f5420d3f39eac755 (diff) | |
Merge pull request #8739 from MrSmite/PetAI_CanAttack_bugfix
Fix a minor PetAI behavioral issue
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 52515ebee8b..78123d2500c 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12106,7 +12106,10 @@ void Unit::CombatStart(Unit* target, bool initialAggro) if (!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER && !target->ToCreature()->HasReactState(REACT_PASSIVE) && target->ToCreature()->IsAIEnabled) { - target->ToCreature()->AI()->AttackStart(this); + if (target->isPet()) + target->ToCreature()->AI()->AttackedBy(this); // PetAI has special handler before AttackStart() + else + target->ToCreature()->AI()->AttackStart(this); } SetInCombatWith(target); |