Core/Spells: Fixed misdirection ability of hunters to end 4 seconds after first damage proc - fixes #114

3 files changed, 17 insertions, 2 deletions

diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 1b3217a02e0..be46e9b1ffb 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -6598,6 +6598,13 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere
                     return true;
                 }
             }
+            // Misdirection
+            if (dummySpell->Id == 34477)
+            {
+                triggered_spell_id = 35079; // 4 sec buff on self
+                target = this;
+                break;
+            }
             break;
         }
         case SPELLFAMILY_PALADIN:
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 8b68bff0a56..3c040090347 100755
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -4965,9 +4965,16 @@ void AuraEffect::HandleAuraDummy(AuraApplication const* aurApp, uint8 mode, bool
                     }
                     break;
                 case SPELLFAMILY_HUNTER:
-                    // Misdirection
-                    if (GetId() == 34477)
+                    switch (GetId())
+                    {
+                    case 34477: // Misdirection
+                        if (aurApp->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE)
+                            target->SetReducedThreatPercent(0, 0);
+                        break;
+                    case 35079: // Misdirection proc
                         target->SetReducedThreatPercent(0, 0);
+                        break;
+                    }
                     break;
                 case SPELLFAMILY_DEATHKNIGHT:
                     // Summon Gargoyle (Dismiss Gargoyle at remove)
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 90c466cf450..85139061303 100755
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3063,6 +3063,7 @@ void SpellMgr::LoadDbcDataCorrections()
             case 57761: // Fireball!
             case 39805: // Lightning Overload
             case 64823: // Item - Druid T8 Balance 4P Bonus
+            case 34477: // Misdirection
             case 44401: // Missile Barrage
                 spellInfo->procCharges = 1;
                 break;