Skip to content

Commit 680ae4d

Browse files
committed
Merge branch 'healplz' into 'master'
Only ignore temporary effects based on their time left See merge request OpenMW/openmw!5137
2 parents a295acf + e0f636d commit 680ae4d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

apps/openmw/mwmechanics/activespells.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,8 @@ namespace MWMechanics
381381
std::optional<ActiveSpellParams> reflected;
382382
for (auto it = spellIt->mEffects.begin(); it != spellIt->mEffects.end();)
383383
{
384-
if (it->mFlags & ESM::ActiveEffect::Flag_Remove && it->mTimeLeft <= 0.f)
384+
if (it->mFlags & ESM::ActiveEffect::Flag_Remove && it->mTimeLeft <= 0.f
385+
&& spellIt->hasFlag(ESM::ActiveSpells::Flag_Temporary))
385386
{
386387
++it;
387388
continue;

0 commit comments

Comments
 (0)