From ac4ceed1da12076dfc89906fec51916814a5efd8 Mon Sep 17 00:00:00 2001 From: SnapperRy Date: Wed, 24 Aug 2016 00:13:26 +0200 Subject: [PATCH] Core/SmartAI: allow SMART_TARGET_OWNER_OR_SUMMONER to target a temporary summon's summoner, too (#17851) Core/SmartAI: allow SMART_TARGET_OWNER_OR_SUMMONER to target a temporary summon's summoner, too --- src/server/game/AI/SmartScripts/SmartScript.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 10fab131e95..b49d142460e 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2767,6 +2767,11 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder const& e, Unit* invoker /* { ObjectGuid charmerOrOwnerGuid = me->GetCharmerOrOwnerGUID(); + if (!charmerOrOwnerGuid) + if (TempSummon* tempSummon = me->ToTempSummon()) + if (Unit* summoner = tempSummon->GetSummoner()) + charmerOrOwnerGuid = summoner->GetGUID(); + if (!charmerOrOwnerGuid) charmerOrOwnerGuid = me->GetCreatorGUID();