From d1370941ca1454069a75c0d792b79260ed7958b4 Mon Sep 17 00:00:00 2001 From: zergtmn Date: Mon, 28 Feb 2011 00:09:35 +0500 Subject: [PATCH] [11208] Restore cooldown marker work for talent 56342 and ranks --- src/game/UnitAuraProcHandler.cpp | 9 +++++++++ src/shared/revision_nr.h | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp index 31883bcf9..ce515c9ca 100644 --- a/src/game/UnitAuraProcHandler.cpp +++ b/src/game/UnitAuraProcHandler.cpp @@ -3129,6 +3129,7 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d break; } case SPELLFAMILY_HUNTER: + { // Piercing Shots if (auraSpellInfo->SpellIconID == 3247 && auraSpellInfo->SpellVisual[0] == 0) { @@ -3143,7 +3144,15 @@ SpellAuraProcResult Unit::HandleProcTriggerSpellAuraProc(Unit *pVictim, uint32 d if (!(procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000020))) return SPELL_AURA_PROC_FAILED; } + // Lock and Load + else if (auraSpellInfo->SpellIconID == 3579) + { + // Check for Lock and Load Marker + if (HasAura(67544)) + return SPELL_AURA_PROC_FAILED; + } break; + } case SPELLFAMILY_PALADIN: { /* diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 84a1b440a..6dde8ace6 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11207" + #define REVISION_NR "11208" #endif // __REVISION_NR_H__