teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Fix exception when getting hit by a trap

Browse source
This commit is contained in:
scrawl 2014-05-15 02:03:42 +02:00
parent a76e391ad0
commit a609dc5674
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwmechanics/spellcasting.cpp
View file

@ -410,11 +410,16 @@ namespace MWMechanics
inflict(caster, target, reflectedEffects, range, true); inflict(caster, target, reflectedEffects, range, true);
if (!appliedLastingEffects.empty()) if (!appliedLastingEffects.empty())
{
int casterActorId = -1;
if (caster.getClass().isActor())
casterActorId = caster.getClass().getCreatureStats(caster).getActorId();
target.getClass().getCreatureStats(target).getActiveSpells().addSpell(mId, mStack, appliedLastingEffects, target.getClass().getCreatureStats(target).getActiveSpells().addSpell(mId, mStack, appliedLastingEffects,
mSourceName, caster.getClass().getCreatureStats(caster).getActorId()); mSourceName, casterActorId);
}
// Notify the target actor they've been hit // Notify the target actor they've been hit
if (anyHarmfulEffect && target.getClass().isActor() && target != caster) if (anyHarmfulEffect && target.getClass().isActor() && target != caster && caster.getClass().isActor())
target.getClass().onHit(target, 0.f, true, MWWorld::Ptr(), caster, true); target.getClass().onHit(target, 0.f, true, MWWorld::Ptr(), caster, true);
} }