Core/Spells: fix penance and holy shock targetting for non faction friendly npcs that appear friendly. should also fix the issue with using mixed groups

2 files changed, 4 insertions, 4 deletions

diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index 9f7f7d847e1..c8c563d3d5d 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -289,8 +289,8 @@ class spell_pal_holy_shock : public SpellScriptLoader
             {
                 Player* caster = GetCaster()->ToPlayer();
                 if (GetTargetUnit())
-                    if (Player* target = GetTargetUnit()->ToPlayer())
-                        if (caster->GetTeam() != target->GetTeam() && !caster->IsValidAttackTarget(target))
+                    if (Unit* target = GetTargetUnit())
+                        if (!caster->IsFriendlyTo(target) && !caster->IsValidAttackTarget(target))
                             return SPELL_FAILED_BAD_TARGETS;
                 return SPELL_CAST_OK;
             }
diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index 5d471afdd2a..47cec6ce516 100644
--- a/src/server/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
@@ -228,8 +228,8 @@ class spell_pri_penance : public SpellScriptLoader
             {
                 Player* caster = GetCaster()->ToPlayer();
                 if (GetTargetUnit())
-                    if (Player* target = GetTargetUnit()->ToPlayer())
-                        if (caster->GetTeam() != target->GetTeam() && !caster->IsValidAttackTarget(target))
+                    if (Unit* target = GetTargetUnit())
+                        if (!caster->IsFriendlyTo(target) && !caster->IsValidAttackTarget(target))
                             return SPELL_FAILED_BAD_TARGETS;
                 return SPELL_CAST_OK;
             }