From ef7d1c39372a717889b707abc6801aa6b4e67761 Mon Sep 17 00:00:00 2001 From: talamortis Date: Sat, 1 Jul 2017 12:23:14 +0100 Subject: [PATCH] pets should now put players in combat unless they are feigned death or shadowmeld. closes #520 --- src/game/AI/CoreAI/PetAI.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/game/AI/CoreAI/PetAI.cpp b/src/game/AI/CoreAI/PetAI.cpp index 66edbc541..be2d536b9 100644 --- a/src/game/AI/CoreAI/PetAI.cpp +++ b/src/game/AI/CoreAI/PetAI.cpp @@ -307,6 +307,13 @@ void PetAI::UpdateAllies() else if (owner->GetTypeId() == TYPEID_PLAYER) group = owner->ToPlayer()->GetGroup(); + //if Pet is in combat put player in combat + if (owner->HasAuraType(SPELL_AURA_MOD_STEALTH) || owner->HasAuraType(SPELL_AURA_FEIGN_DEATH)) + return; + else + if (me->IsInCombat()) + owner->IsInCombat(); + //only pet and owner/not in group->ok if (m_AllySet.size() == 2 && !group) return;