Merge branch 'i_am_the_caster_now' into 'master'

Preserve the original caster if classic reflected absorb spells behaviour is on

Closes #6511

See merge request OpenMW/openmw!1497

1 files changed, 9 insertions, 1 deletions

diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index d435bd6c44..3fbb347098 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -9,6 +9,8 @@
 
 #include <components/esm/loadmgef.hpp>
 
+#include <components/settings/settings.hpp>
+
 #include "creaturestats.hpp"
 #include "spellcasting.hpp"
 #include "spelleffects.hpp"
@@ -236,7 +238,13 @@ namespace MWMechanics
                 if(result == MagicApplicationResult::REFLECTED)
                 {
                     if(!reflected)
-                        reflected = {*spellIt, ptr};
+                    {
+                        static const bool keepOriginalCaster = Settings::Manager::getBool("classic reflected absorb spells behavior", "Game");
+                        if(keepOriginalCaster)
+                            reflected = {*spellIt, caster};
+                        else
+                            reflected = {*spellIt, ptr};
+                    }
                     auto& reflectedEffect = reflected->mEffects.emplace_back(*it);
                     reflectedEffect.mFlags = ESM::ActiveEffect::Flag_Ignore_Reflect | ESM::ActiveEffect::Flag_Ignore_SpellAbsorption;
                     it = spellIt->mEffects.erase(it);