*Use amount check instead of positivity check for aura effects.

*Fix Overkill and Master of subtlety.

--HG--
branch : trunk

1 files changed, 11 insertions, 13 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index e12b7ecd7ca..037c00fcff2 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -4915,6 +4915,17 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     }
                     return false;
                 }
+                // Overkill
+                case 58426:
+                {
+                    if (procEx & AURA_REMOVE_PROC_EX_MASK)
+                        triggered_spell_id = 58428;
+                    else
+                    {
+                        triggered_spell_id = 58427;
+                    }
+                    break;
+                }
                 // Eye for an Eye
                 case 9799:
                 case 25988:
@@ -5033,18 +5044,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                     triggered_spell_id = 34650;
                     break;
                 }
-                // Overkill
-                case 58426:
-                {
-                    if (procEx & AURA_REMOVE_PROC_EX_MASK)
-                        triggered_spell_id = 58428;
-                    else
-                    {
-                        basepoints0 = -triggerAmount;
-                        triggered_spell_id = 58427;
-                    }
-                    break;
-                }
                 // Mark of Malice
                 case 33493:
                 {
@@ -13486,7 +13485,6 @@ bool Unit::IsTriggeredAtSpellProcEvent(Unit *pVictim, Aura * aura, SpellEntry co
     {
         modOwner->ApplySpellMod(spellProto->Id,SPELLMOD_CHANCE_OF_SUCCESS,chance);
     }
-
     return roll_chance_f(chance);
 }