araxiaonline/TrinityCore2
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore2.git synced 2026-06-15 20:42:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/SmartAI: use BaseObject for guid based targeting if available

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Rat
2010-11-03 16:40:12 +01:00
parent 6b6d992d55
commit 6f748a76a1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/AI/SmartScripts/SmartScript.cpp
View File

@@ -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)
{