diff options
| author | Rat <none@none> | 2010-11-03 16:40:12 +0100 |
|---|---|---|
| committer | Rat <none@none> | 2010-11-03 16:40:12 +0100 |
| commit | 6f748a76a12a9f8c9e799ed12edcce193c38f6bb (patch) | |
| tree | 3bc3526b52b03ae07df51c6eee69ca0510218d56 /src | |
| parent | 6b6d992d5544dfb3d24cd969f2a7e3f66b2835c8 (diff) | |
Core/SmartAI: use BaseObject for guid based targeting if available
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 6e090dafd68..7857cd1d75e 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -1303,12 +1303,12 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder e, Unit* invoker) target = HashMapHolder<Creature>::Find(guid); } else { - if (!invoker) + if (!invoker && !GetBaseObject()) { - sLog.outError("SMART_TARGET_CREATURE_GUID can not be used without invoker and without entry"); + sLog.outErrorDb("SMART_TARGET_CREATURE_GUID can not be used without invoker and without entry"); return NULL; } - target = FindCreatureNear(invoker, e.target.unitGUID.guid); + target = FindCreatureNear(invoker?invoker:GetBaseObject(), e.target.unitGUID.guid); } if (target) { @@ -1325,12 +1325,12 @@ ObjectList* SmartScript::GetTargets(SmartScriptHolder e, Unit* invoker) target = HashMapHolder<GameObject>::Find(guid); } else { - if (!invoker) + if (!invoker && !GetBaseObject()) { - sLog.outError("SMART_TARGET_GAMEOBJECT_GUID can not be used without invoker and without entry"); + sLog.outErrorDb("SMART_TARGET_GAMEOBJECT_GUID can not be used without invoker and without entry"); return NULL; } - target = FindGameObjectNear(invoker, e.target.goGUID.guid); + target = FindGameObjectNear(invoker?invoker:GetBaseObject(), e.target.goGUID.guid); } if (target) { |