mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some code porting discrepancies

Browse source
This commit is contained in:
Antz 2016-09-16 11:12:41 +01:00 • committed by Antz
parent f0febf526b
commit 00983174a5
19 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Object/Creature.cpp
View file

@ -1785,7 +1785,7 @@ void Creature::SetDeathState(DeathState s)
if ((s == JUST_DIED && !m_IsDeadByDefault) || (s == JUST_ALIVED && m_IsDeadByDefault))
{
m_corpseDecayTimer = m_corpseDelay * IN_MILLISECONDS; // the max/default time for corpse decay (before creature is looted/AllLootRemovedFromCorpse() is called)
m_respawnTime = time(nullptr) + m_respawnDelay; // respawn delay (spawntimesecs)
m_respawnTime = time(NULL) + m_respawnDelay; // respawn delay (spawntimesecs)
// always save boss respawn time at death to prevent crash cheating
if (sWorld.getConfig(CONFIG_BOOL_SAVE_RESPAWN_TIME_IMMEDIATELY) || IsWorldBoss())
@ -1818,7 +1818,7 @@ void Creature::SetDeathState(DeathState s)
Unit::SetDeathState(ALIVE);
SetHealth(GetMaxHealth());
SetLootRecipient(nullptr);
SetLootRecipient(NULL);
if (GetTemporaryFactionFlags() & TEMPFACTION_RESTORE_RESPAWN)
ClearTemporaryFaction();