araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-16 13:09:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Core/WorldObject: Replace non-std::chrono SummonGameObject overloads

Browse Source 
Also fix intended despawn time of GOs used by the "Engineering a Disaster" quest

(cherry picked from commit 8642aaaf92)
This commit is contained in:
Carbenium
2020-07-27 00:25:18 +02:00
committed by Shauren
parent 217c2d9ef3
commit 82fce41852
30 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Entities/Object/Object.cpp
View File

@@ -1880,7 +1880,7 @@ TempSummon* WorldObject::SummonPersonalClone(Position const& pos, TempSummonType
return nullptr;
}
GameObject* WorldObject::SummonGameObject(uint32 entry, Position const& pos, QuaternionData const& rot, uint32 respawnTime, GOSummonType summonType)
GameObject* WorldObject::SummonGameObject(uint32 entry, Position const& pos, QuaternionData const& rot, Seconds respawnTime, GOSummonType summonType)
{
if (!IsInWorld())
return nullptr;
@@ -1899,7 +1899,7 @@ GameObject* WorldObject::SummonGameObject(uint32 entry, Position const& pos, Qua
PhasingHandler::InheritPhaseShift(go, this);
go->SetRespawnTime(respawnTime);
go->SetRespawnTime(respawnTime.count());
if (GetTypeId() == TYPEID_PLAYER || (GetTypeId() == TYPEID_UNIT && summonType == GO_SUMMON_TIMED_OR_CORPSE_DESPAWN)) //not sure how to handle this
ToUnit()->AddGameObject(go);
else
@@ -1909,7 +1909,7 @@ GameObject* WorldObject::SummonGameObject(uint32 entry, Position const& pos, Qua
return go;
}
GameObject* WorldObject::SummonGameObject(uint32 entry, float x, float y, float z, float ang, QuaternionData const& rot, uint32 respawnTime, GOSummonType summonType)
GameObject* WorldObject::SummonGameObject(uint32 entry, float x, float y, float z, float ang, QuaternionData const& rot, Seconds respawnTime, GOSummonType summonType)
{
if (!x && !y && !z)
{