Merge pull request #10716 from Discover-/SAI_Owner_Or_Summoner

Core/SAI: Make SMART_TARGET_OWNER_OR_SUMMONER also work for creatures su...
This commit is contained in:
Aokromes
2013-09-06 17:29:15 -07:00

View File

@@ -2509,8 +2509,15 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /*
case SMART_TARGET_OWNER_OR_SUMMONER:
{
if (me)
if (Unit* owner = ObjectAccessor::GetUnit(*me, me->GetCharmerOrOwnerGUID()))
{
uint64 charmerOrOwnerGuid = me->GetCharmerOrOwnerGUID();
if (!charmerOrOwnerGuid)
charmerOrOwnerGuid = me->GetCreatorGUID();
if (Unit* owner = ObjectAccessor::GetUnit(*me, charmerOrOwnerGuid))
l->push_back(owner);
}
break;
}
case SMART_TARGET_THREAT_LIST: