*Fix grounding totem.

*Fix runic power regeneration of butchery
*Fix some problems with master of subtlety buff expire.
*Do not allow arcane intellect and brillance to stack.

--HG--
branch : trunk

1 files changed, 8 insertions, 1 deletions

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 8970797e646..14628b2c66b 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1257,7 +1257,7 @@ void Aura::DropAuraCharge()
         if(--m_procCharges) // Send charge change
             SendAuraUpdate();
         else              // Last charge dropped
-            m_target->RemoveAura(this);
+            m_target->RemoveAura(this, AURA_REMOVE_BY_EXPIRE);
     }
 }
 
@@ -6223,6 +6223,13 @@ void AuraEffect::PeriodicTick()
                 // cannibalize anim
                 m_target->HandleEmoteCommand(EMOTE_STATE_CANNIBALIZE);
             }
+            // Butchery
+            else if (m_spellProto->SpellFamilyName==SPELLFAMILY_DEATHKNIGHT
+                && m_spellProto->SpellIconID==2664)
+            {
+                if (m_target->isInCombat())
+                    m_target->ModifyPower(pt,m_amount);
+            }
 
             // Anger Management
             // amount = 1+ 16 = 17 = 3,4*5 = 10,2*5/3