From ba58a322e407608ba7bdfab7a5e91adacbe9295b Mon Sep 17 00:00:00 2001 From: psi29a Date: Tue, 30 Aug 2022 07:41:38 +0000 Subject: [PATCH] Merge branch 'no_shiny_rocks' into 'master' Only reflect spells that have a caster Closes #6969 See merge request OpenMW/openmw!2349 (cherry picked from commit ca90b53c30a60a714240aba35a333e7179034f44) 7729ef2e Only reflect spells that have a caster --- apps/openmw/mwmechanics/spelleffects.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/openmw/mwmechanics/spelleffects.cpp b/apps/openmw/mwmechanics/spelleffects.cpp index 81a3dc0921..050ca93234 100644 --- a/apps/openmw/mwmechanics/spelleffects.cpp +++ b/apps/openmw/mwmechanics/spelleffects.cpp @@ -308,7 +308,7 @@ namespace if(target != caster && spellParams.getType() != ESM::ActiveSpells::Type_Enchantment && spellParams.getType() != ESM::ActiveSpells::Type_Permanent) { bool canReflect = magicEffect->mData.mFlags & ESM::MagicEffect::Harmful && !(magicEffect->mData.mFlags & ESM::MagicEffect::Unreflectable) && - !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_Reflect) && magnitudes.get(ESM::MagicEffect::Reflect).getMagnitude() > 0.f; + !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_Reflect) && magnitudes.get(ESM::MagicEffect::Reflect).getMagnitude() > 0.f && !caster.isEmpty(); bool canAbsorb = !(effect.mFlags & ESM::ActiveEffect::Flag_Ignore_SpellAbsorption) && magnitudes.get(ESM::MagicEffect::SpellAbsorption).getMagnitude() > 0.f; if(canReflect || canAbsorb) {