From 362ae2d4c6393063e32c328f752b88dd1bde5db7 Mon Sep 17 00:00:00 2001
From: Shauren <none@none>
Date: Wed, 4 Aug 2010 17:49:23 +0200
Subject: Fixed pet talents: Guard Dog and Silverback Removed pre-3.3.0 code
 for Improved Cower

Closes issue #3198.

--HG--
branch : trunk
---
 src/server/game/Entities/Unit/Unit.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index c8ce0fe502c..a7226a8fb7e 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -7717,22 +7717,22 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
             }
             break;
         }
-         case SPELLFAMILY_PET:
+        case SPELLFAMILY_PET:
         {
-            // improved cower
-            if (dummySpell->SpellIconID == 958 && procSpell->SpellIconID == 958)
+            switch (dummySpell->SpellIconID)
             {
-                triggered_spell_id = dummySpell->Id == 53180 ? 54200 : 54201;
-                target = this;
-                break;
-            }
-            // guard dog
-            if (dummySpell->SpellIconID == 201 && procSpell->SpellIconID == 201)
-            {
-                triggered_spell_id = 54445;
-                target = this;
-                pVictim->AddThreat(this,procSpell->EffectBasePoints[0]*triggerAmount/100.0f);
-                break;
+                // Guard Dog
+                case 201:
+                    triggered_spell_id = 54445;
+                    target = this;
+                    float addThreat = SpellMgr::CalculateSpellEffectAmount(procSpell, 0, this) * triggerAmount / 100.f;
+                    pVictim->AddThreat(this, addThreat);
+                    break;
+                // Silverback
+                case 1582:
+                    triggered_spell_id = dummySpell->Id == 62765 ? 62801 : 62800;
+                    target = this;
+                    break;
             }
             break;
         }
-- 
cgit v1.2.3