Merge branch 'master' of github.com:TrinityCore/TrinityCore

This commit is contained in:
Shauren
2011-05-14 12:53:20 +02:00

View File

@@ -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:
{