Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Creature: Fixed ForcedDespawn

Browse Source
This commit is contained in:
Malcrom
2017-04-24 09:19:58 -02:30
committed by Aokromes
parent d4759e43f1
commit de0bbf4056
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1821,22 +1821,27 @@ void Creature::ForcedDespawn(uint32 timeMSToDespawn, Seconds const& forceRespawn
return;
}
if (IsAlive())
if (forceRespawnTimer > Seconds::zero())
{
if (forceRespawnTimer > Seconds::zero())
if (IsAlive())
{
uint32 respawnDelay = m_respawnDelay;
uint32 corpseDelay = m_corpseDelay;
m_respawnDelay = forceRespawnTimer.count();
m_corpseDelay = 0;
setDeathState(JUST_DIED);
m_respawnDelay = respawnDelay;
m_corpseDelay = corpseDelay;
}
else
setDeathState(JUST_DIED);
{
m_corpseRemoveTime = time(NULL);
m_respawnTime = time(NULL) + forceRespawnTimer.count();
}
}
else
if (IsAlive())
setDeathState(JUST_DIED);
RemoveCorpse(false);
}