diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index dd97bfa368..7c445aa2b7 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1941,7 +1941,10 @@ void Creature::setDeathState(DeathState s) if (s == JUST_DIED) { - m_corpseRemoveTime = GameTime::GetGameTime() + m_corpseDelay; + m_corpseRemoveTime = GameTime::GetGameTime(); + if (!HasStaticFlag(CREATURE_STATIC_FLAG_DESPAWN_INSTANTLY)) + m_corpseRemoveTime += m_corpseDelay; + uint32 respawnDelay = m_respawnDelay; if (uint32 scalingMode = sWorld->getIntConfig(CONFIG_RESPAWN_DYNAMICMODE)) GetMap()->ApplyDynamicModeRespawnScaling(this, m_spawnId, respawnDelay, scalingMode);