diff options
| author | Aokromes <jipr@hotmail.com> | 2013-09-06 17:29:15 -0700 |
|---|---|---|
| committer | Aokromes <jipr@hotmail.com> | 2013-09-06 17:29:15 -0700 |
| commit | c3c5327fbddc0a742325337bd667bcc81fd8f8ae (patch) | |
| tree | da08a4135c2ae40878e308c224251d897b02aa7c | |
| parent | f66120060adf15d39c7a40fa9c4e501e024a6a21 (diff) | |
| parent | 926edaf49dd91c8d550919f8a37b90c59011b2e0 (diff) | |
Merge pull request #10716 from Discover-/SAI_Owner_Or_Summoner
Core/SAI: Make SMART_TARGET_OWNER_OR_SUMMONER also work for creatures su...
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index f94a3e79066..111ac53e670 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: |