Revert "Revert recent changes in SPELL_EFFECT_TRIGGER_SPELL_WITH_VALUE until proper fix is made"

This reverts commit ad66302e55c9c04c5247b2d9b6a04a64fea8f92a.