Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kandera
2012-04-26 11:15:23 -04:00
parent bf7a32b79e
commit b5a5080df0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/scripts/Spells/spell_paladin.cpp
View File

@@ -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;
}

4
src/server/scripts/Spells/spell_priest.cpp
View File

@@ -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;
}