aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2011-05-14 12:53:20 +0200
committerShauren <shauren.trinity@gmail.com>2011-05-14 12:53:20 +0200
commitb23effb561d9d8727dae87139d54780f4ca35da8 (patch)
treee97278d5bc1318c99fbbf78617d12cccf76650fd
parentd9ccb716fd7dd84472d7312fd03d1750b7275e35 (diff)
parentaa409f84415a1a534a2dd0296aad9da21196fcad (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore
-rwxr-xr-xsrc/server/game/Entities/Unit/Unit.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 38e9ee7a548..5bc39f39514 100755
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -8237,13 +8237,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
{
switch (auraSpellInfo->Id)
{
- // Item - Druid T10 Balance 2P Bonus
- case 16870:
- {
- if (HasAura(70718))
- CastSpell(this, 70721, true);
- break;
- }
// Druid Forms Trinket
case 37336:
{
@@ -8749,6 +8742,13 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
// Need add combopoint AFTER finish movie (or they dropped in finish phase)
break;
}
+ // Item - Druid T10 Balance 2P Bonus
+ case 16870:
+ {
+ if (HasAura(70718))
+ CastSpell(this, 70721, true);
+ break;
+ }
// Bloodthirst (($m/100)% of max health)
case 23880:
{