Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Use std::chrono overload of Creature::DespawnOrUnsummon

Browse Source 
(cherry picked from commit c39eb9b504)
This commit is contained in:
Carbenium
2020-07-26 01:01:30 +02:00
committed by Shauren
parent 58e1c091a2
commit b8a3ab880f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
View File

@@ -615,7 +615,7 @@ void BossAI::_DespawnAtEvade(Seconds delayToRespawn /*= 30s*/, Creature* who /*=
return;
}
who->DespawnOrUnsummon(0, delayToRespawn);
who->DespawnOrUnsummon(0s, delayToRespawn);
if (instance && who == me)
instance->SetBossState(_bossId, FAIL);

2
src/server/game/AI/ScriptedAI/ScriptedEscortAI.cpp
View File

@@ -225,7 +225,7 @@ void EscortAI::UpdateAI(uint32 diff)
if (_instantRespawn)
{
if (!isEscort)
me->DespawnOrUnsummon(0, 1s);
me->DespawnOrUnsummon(0s, 1s);
else
me->GetMap()->Respawn(SPAWN_TYPE_CREATURE, me->GetSpawnId());
}

2
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -298,7 +298,7 @@ CreatureBaseStats const* CreatureBaseStats::GetBaseStats(uint8 level, uint8 unit
bool ForcedDespawnDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
{
m_owner.DespawnOrUnsummon(0, m_respawnTimer); // since we are here, we are not TempSummon as object type cannot change during runtime
m_owner.DespawnOrUnsummon(0s, m_respawnTimer); // since we are here, we are not TempSummon as object type cannot change during runtime
return true;
}

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

@@ -742,7 +742,7 @@ void Map::ScriptsProcess()
case SCRIPT_COMMAND_DESPAWN_SELF:
// 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);
cSource->DespawnOrUnsummon(Milliseconds(step.script->DespawnSelf.DespawnDelay));
else if (GameObject* goSource = _GetScriptGameObjectSourceOrTarget(source, target, step.script, true))
goSource->DespawnOrUnsummon(Milliseconds(step.script->DespawnSelf.DespawnDelay));
break;