Merge pull request #1181 from Assumeru/teleportation

Fix teleportation being unreachable
8 years ago · 0cd4fc8cae
parent cba1aff9ab 1a073ca642
commit 0cd4fc8cae
1 changed files with 3 additions and 6 deletions
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@ -613,13 +613,10 @@ namespace MWMechanics
                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())
        {