Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Creatures: uncontrolled minions such as Army of the Dead and totem elementals will now be stored in the player's controlled list as well to trigger aggro mechanics

Browse Source
This commit is contained in:
Ovahlord
2020-04-22 00:40:48 +02:00
parent c00858d969
commit e67167e8cf
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/game/Entities/Creature/TemporarySummon.cpp
View File

@@ -267,9 +267,6 @@ void TempSummon::UnSummon(uint32 msTime)
{
if (owner->GetTypeId() == TYPEID_UNIT && owner->ToCreature()->IsAIEnabled)
owner->ToCreature()->AI()->SummonedCreatureDespawn(this);
if (owner->IsTotem())
owner->m_Controlled.erase(this);
}
AddObjectToRemoveList();
@@ -323,6 +320,15 @@ void Minion::InitStats(uint32 duration)
// Only controlable guardians and companions get a owner guid
if (HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN) || (m_Properties && m_Properties->Title == AsUnderlyingType(SummonTitle::Companion)))
GetOwner()->SetMinion(this, true);
else if (!HasUnitTypeMask(UNIT_MASK_PET | UNIT_MASK_HUNTER_PET))
{
GetOwner()->m_Controlled.insert(this);
// Store the totem elementals in players controlled list as well to trigger aggro mechanics
if (GetOwner()->IsTotem())
if (Unit* totemOwner = GetOwner()->GetOwner())
totemOwner->m_Controlled.insert(this);
}
}
void Minion::RemoveFromWorld()
@@ -332,6 +338,14 @@ void Minion::RemoveFromWorld()
if (HasUnitTypeMask(UNIT_MASK_CONTROLABLE_GUARDIAN) || (m_Properties && m_Properties->Title == AsUnderlyingType(SummonTitle::Companion)))
GetOwner()->SetMinion(this, false);
else if (!HasUnitTypeMask(UNIT_MASK_PET | UNIT_MASK_HUNTER_PET))
{
GetOwner()->m_Controlled.erase(this);
if (GetOwner()->IsTotem())
if (Unit* totemOwner = GetOwner()->GetOwner())
totemOwner->m_Controlled.erase(this);
}
TempSummon::RemoveFromWorld();
}