1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-16 14:46:33 +00:00

Don't add magic effects to dead actors

This commit is contained in:
Evil Eye 2025-08-24 19:03:53 +02:00
parent 2b7f775ffe
commit 49de215112

View file

@ -294,6 +294,8 @@ namespace MWMechanics
addToSpells(ptr, spell, context); addToSpells(ptr, spell, context);
mQueue.clear(); mQueue.clear();
if (!creatureStats.isDead())
{
// Vanilla only does this on cell change I think // Vanilla only does this on cell change I think
const auto& spells = creatureStats.getSpells(); const auto& spells = creatureStats.getSpells();
for (const ESM::Spell* spell : spells) for (const ESM::Spell* spell : spells)
@ -304,9 +306,10 @@ namespace MWMechanics
initParams(ptr, ActiveSpellParams{ spell, ptr, true }, context); initParams(ptr, ActiveSpellParams{ spell, ptr, true }, context);
} }
} }
}
if (ptr.getClass().hasInventoryStore(ptr) if (ptr.getClass().hasInventoryStore(ptr)
&& !(creatureStats.isDead() && !creatureStats.isDeathAnimationFinished())) && !(creatureStats.isDead() && creatureStats.isDeathAnimationFinished()))
{ {
auto& store = ptr.getClass().getInventoryStore(ptr); auto& store = ptr.getClass().getInventoryStore(ptr);
if (store.getInvListener() != nullptr) if (store.getInvListener() != nullptr)