Merge pull request #1181 from Assumeru/teleportation

Fix teleportation being unreachable
This commit is contained in:
scrawl 2017-01-04 14:17:21 +01:00 committed by GitHub
commit 0cd4fc8cae

View file

@ -613,13 +613,10 @@ namespace MWMechanics
return true; return true;
} }
} }
else if (target.getClass().isActor()) else if (target.getClass().isActor() && effectId == ESM::MagicEffect::Dispel)
{ {
if (effectId == ESM::MagicEffect::Dispel) target.getClass().getCreatureStats(target).getActiveSpells().purgeAll(magnitude);
{ return true;
target.getClass().getCreatureStats(target).getActiveSpells().purgeAll(magnitude);
return true;
}
} }
else if (target.getClass().isActor() && target == getPlayer()) else if (target.getClass().isActor() && target == getPlayer())
{ {