Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove Hack detecting spell 61988 in HasAura()

Browse Source 
Correctly cast 61988/61987 after casting Avenging Wrath/Divine Shield respectively
(This will correctly show both spells disabled state)
Don't allow casting Lay on Hands on self when aura 61988 is present (ie. after using Avenging Wrath)

--HG--
branch : trunk
This commit is contained in:
thenecromancer
2010-03-15 18:03:43 +01:00
parent 3ba0862926
commit a81ad6986c
5 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/game/Spell.cpp
View File

@@ -1419,6 +1419,12 @@ void Spell::DoTriggersOnSpellHit(Unit *unit)
// Cast Avenging Wrath Marker
m_caster->CastSpell(unit,61987, true, m_CastItem);
}
// Avenging Wrath Marker
else if (m_preCastSpell==61987)
{
// Cast unknown spell (client will use to determine if Divine Shield is castable)
m_caster->CastSpell(unit,61988, true, m_CastItem);
}
else if (sSpellStore.LookupEntry(m_preCastSpell))
m_caster->CastSpell(unit,m_preCastSpell, true, m_CastItem);
}
@@ -4511,6 +4517,11 @@ SpellCastResult Spell::CheckCast(bool strict)
else
return SPELL_FAILED_BAD_TARGETS;
}
// Lay on Hands - cannot be casted on paladin after using Avenging Wrath
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_PALADIN
&& m_spellInfo->SpellFamilyFlags[0] & 0x0008000)
if (target->HasAura(61988)) // Avenging Wrath Marker (Not existing spell)
return SPELL_FAILED_TARGET_AURASTATE;
}
}