[patch] Clear combo points for death target.

[Den]

С мертвой цели комбо поинты должны удаляться через 10 секунд, а не сразу, проверено на офе.

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 9bdcc79..1d8f379 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -1403,8 +1403,6 @@ void Player::SetDeathState(DeathState s)
     {
         // drunken state is cleared on death
         SetDrunkValue(0);
-        // lost combo points at any target (targeted combo points clear in Unit::SetDeathState)
-        ClearComboPoints();
 
         clearResurrectRequestData();
 
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 888d4a6..9bb08e1 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -213,6 +213,8 @@ Unit::Unit() :
 
     m_castCounter = 0;
 
+    m_ClearComboPointsExpiredTime = 0;
+
     // m_Aura = NULL;
     // m_AurasCheck = 2000;
     // m_removeAuraTimer = 4;
@@ -363,6 +365,14 @@ void Unit::Update(uint32 update_diff, uint32 p_time)
             m_vehicleInfo->Update(update_diff);
     }
 
+    if (m_ClearComboPointsExpiredTime)
+    {
+        if (update_diff >= m_ClearComboPointsExpiredTime)
+            ClearComboPointHolders();
+        else
+            m_ClearComboPointsExpiredTime -= update_diff;
+    }
+
     // update abilities available only for fraction of time
     UpdateReactives(update_diff);
 
@@ -8584,7 +8594,8 @@ void Unit::SetDeathState(DeathState s)
     {
         CombatStop();
         DeleteThreatList();
-        ClearComboPointHolders();                           // any combo points pointed to unit lost at it death
+
+        m_ClearComboPointsExpiredTime = 10000;
 
         if (IsNonMeleeSpellCasted(false))
             InterruptNonMeleeSpells(false);
diff --git a/src/game/Unit.h b/src/game/Unit.h
index 2d3305c..31bebec 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -1987,6 +1987,8 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         uint32 m_state;                                     // Even derived shouldn't modify
         uint32 m_CombatTimer;
 
+        uint32 m_ClearComboPointsExpiredTime;
+
         Spell* m_currentSpells[CURRENT_MAX_SPELL];
         uint32 m_castCounter;                               // count casts chain of triggered spells for prevent infinity cast crashes

[Amaru]

Ну это только с 4.х, так как там есть спеллы которые требуют комбо поинты и которые можно юзать на мертвые таргеты

[Den]

А мне помнится в 3.3.5, можно было использовать Slice and Dice, когда цель мертва и на ней есть комбо поинты.

[Amaru]

*edit* As of 4.0, you don't immediately lose combo points on a dead target (they disappear after about 20 seconds, or when you generate new ones on another target) and you can use Savage Roar (same with the rogue's Slice and Dice) without the target selected (alive or not) so you can kill an enemy however you like, and then spend remaining combo points on a SR before attacking the next enemy. Note however, that some boss adds or otherwise summoned creatures despawn instantly on death, meaning any combo points on them are lost.

с вовхеда http://www.wowhead.com/spell=52610/savage-roar