From 3215c80ccee4a87c6b1cf11c72aeacc4d597a356 Mon Sep 17 00:00:00 2001
From: zerg <Sergey.Chelombitko@gmail.com>
Date: Wed, 30 Jun 2010 22:12:31 +0400
Subject: [PATCH] [10129] Add cooldown marker for talent 56342 and ranks
 triggering spell.

(based on zergtmn's repo commit 87d1309)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
---
 src/game/Spell.cpp       | 7 +++++++
 src/game/Unit.cpp        | 7 +++++++
 src/shared/revision_nr.h | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index bcdca9c3b..8751e8ebc 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2799,6 +2799,13 @@ void Spell::cast(bool skipCheck)
                 AddTriggeredSpell(52874);                   // Fan of Knives (offhand)
             }
             break;
+        case SPELLFAMILY_HUNTER:
+        {
+            // Lock and Load
+            if (m_spellInfo->Id == 56453)
+                AddPrecastSpell(67544);                     // Lock and Load Marker
+            break;
+        }
         case SPELLFAMILY_PALADIN:
         {
             // Hand of Reckoning
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 57311d7db..f2d4b5e24 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7567,6 +7567,13 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
                 if (!(procSpell->SpellFamilyFlags & UI64LIT(0x0000000000000020)))
                     return false;
             }
+            // Lock and Load
+            else if (auraSpellInfo->SpellIconID == 3579)
+            {
+                // Check for Lock and Load Marker
+                if (HasAura(67544))
+                    return false;
+            }
             break;
         case SPELLFAMILY_PALADIN:
         {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index c6bd55789..66b9ae9cb 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 "10128"
+ #define REVISION_NR "10129"
 #endif // __REVISION_NR_H__