From 9761affc8dcc9cc54ba13bad4e1522d3b3ffda42 Mon Sep 17 00:00:00 2001 From: Discover- Date: Wed, 4 Sep 2013 09:35:21 +0200 Subject: Core/SAI: Make SMART_TARGET_OWNER_OR_SUMMONER also work for creatures summoned by spells --- src/server/game/AI/SmartScripts/SmartScript.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index f94a3e79066..e6fab906736 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -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: -- cgit v1.2.3 From 926edaf49dd91c8d550919f8a37b90c59011b2e0 Mon Sep 17 00:00:00 2001 From: Discover- Date: Wed, 4 Sep 2013 14:07:27 +0200 Subject: Tabs to spaces... --- src/server/game/AI/SmartScripts/SmartScript.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index e6fab906736..111ac53e670 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2509,15 +2509,15 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* case SMART_TARGET_OWNER_OR_SUMMONER: { if (me) - { - uint64 charmerOrOwnerGuid = me->GetCharmerOrOwnerGUID(); + { + uint64 charmerOrOwnerGuid = me->GetCharmerOrOwnerGUID(); - if (!charmerOrOwnerGuid) - charmerOrOwnerGuid = me->GetCreatorGUID(); + if (!charmerOrOwnerGuid) + charmerOrOwnerGuid = me->GetCreatorGUID(); if (Unit* owner = ObjectAccessor::GetUnit(*me, charmerOrOwnerGuid)) l->push_back(owner); - } + } break; } case SMART_TARGET_THREAT_LIST: -- cgit v1.2.3