Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4

Browse Source
This commit is contained in:
Ovahlord committed 2018-07-23 15:57:10 +02:00
2 parents ae12bcc74f 9192bf9cd6
commit a0e288e761
45 files changed
+409 -99
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Entities/GameObject/GameObject.cpp
+8 -3
View File
@@ -387,7 +387,10 @@ void GameObject::Update(uint32 diff)
if (m_despawnDelay > diff)
m_despawnDelay -= diff;
else
{
m_despawnDelay = 0;
DespawnOrUnsummon(0ms, m_despawnRespawnTime);;
}
}
switch (m_lootState)
@@ -806,7 +809,7 @@ void GameObject::AddUniqueUse(Player* player)
m_unique_users.insert(player->GetGUID());
}
void GameObject::DespawnOrUnsummon(Milliseconds const& delay, Seconds const& forceRespawnTime)
void GameObject::DespawnOrUnsummon(Milliseconds delay, Seconds forceRespawnTime)
{
if (delay > 0ms)
{
@@ -818,9 +821,11 @@ void GameObject::DespawnOrUnsummon(Milliseconds const& delay, Seconds const& for
}
else
{
uint32 const respawnDelay = (forceRespawnTime > 0s) ? forceRespawnTime.count() : m_respawnDelayTime;
if (m_goData && respawnDelay)
if (m_goData)
{
uint32 const respawnDelay = (forceRespawnTime > 0s) ? forceRespawnTime.count() : m_goData->spawntimesecs;
SaveRespawnTime(respawnDelay);
}
Delete();
}
}