Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/MapScripts: Add support to GameObjects to SCRIPT_COMMAND_DESPAWN_SELF

Browse Source 
(cherry picked from commit da19ad117e)
This commit is contained in:
jackpoz
2019-02-24 13:51:59 +01:00
committed by Shauren
parent 49e1ff34b7
commit b8396f682c
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/server/game/Maps/MapScripts.cpp
View File

@@ -155,6 +155,39 @@ inline Creature* Map::_GetScriptCreatureSourceOrTarget(Object* source, Object* t
return creature;
}
inline GameObject* Map::_GetScriptGameObjectSourceOrTarget(Object* source, Object* target, ScriptInfo const* scriptInfo, bool bReverse) const
{
GameObject* gameobject = nullptr;
if (!source && !target)
TC_LOG_ERROR("scripts", "%s source and target objects are NULL.", scriptInfo->GetDebugInfo().c_str());
else
{
if (bReverse)
{
// Check target first, then source.
if (target)
gameobject = target->ToGameObject();
if (!gameobject && source)
gameobject = source->ToGameObject();
}
else
{
// Check source first, then target.
if (source)
gameobject = source->ToGameObject();
if (!gameobject && target)
gameobject = target->ToGameObject();
}
if (!gameobject)
TC_LOG_ERROR("scripts", "%s neither source nor target are gameobjects (source: TypeId: %u, Entry: %u, %s; target: TypeId: %u, Entry: %u, %s), skipping.",
scriptInfo->GetDebugInfo().c_str(),
source ? source->GetTypeId() : 0, source ? source->GetEntry() : 0, (source ? source->GetGUID() : ObjectGuid::Empty).ToString().c_str(),
target ? target->GetTypeId() : 0, target ? target->GetEntry() : 0, (target ? target->GetGUID() : ObjectGuid::Empty).ToString().c_str());
}
return gameobject;
}
inline Unit* Map::_GetScriptUnit(Object* obj, bool isSource, ScriptInfo const* scriptInfo) const
{
Unit* unit = nullptr;
@@ -719,9 +752,11 @@ void Map::ScriptsProcess()
break;
case SCRIPT_COMMAND_DESPAWN_SELF:
// Target or source must be Creature.
// First try with target or source creature, then with target or source gameobject
if (Creature* cSource = _GetScriptCreatureSourceOrTarget(source, target, step.script, true))
cSource->DespawnOrUnsummon(step.script->DespawnSelf.DespawnDelay);
else if (GameObject* goSource = _GetScriptGameObjectSourceOrTarget(source, target, step.script, true))
goSource->DespawnOrUnsummon(Milliseconds(step.script->DespawnSelf.DespawnDelay));
break;
case SCRIPT_COMMAND_LOAD_PATH: