diff options
| author | Shocker <shocker@freakz.ro> | 2011-06-18 18:30:37 +0300 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2011-06-18 18:30:37 +0300 |
| commit | d7762a9ebbc98e37a4067516e7b87d9c06df4890 (patch) | |
| tree | 3ade62ec74b0d175f1765fc03c1c18eadab9e670 | |
| parent | 7f0af21fcd0d9d69e61390db58ff517356c8cf34 (diff) | |
Core/Spells: Remove duplicated code for Tiny Abomination in a Jar
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 68026515ef7..eb1f2ac59f1 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -6904,25 +6904,6 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger break; } case 71406: // Tiny Abomination in a Jar - { - if (!pVictim || !pVictim->isAlive()) - return false; - - CastSpell(this, 71432, true, NULL, triggeredByAura); - - Aura const* dummy = GetAura(71432); - if (!dummy || dummy->GetStackAmount() < 8) - return false; - - RemoveAurasDueToSpell(71432); - triggered_spell_id = 71433; // default main hand attack - // roll if offhand - if (Player const* player = ToPlayer()) - if (player->GetWeaponForAttack(OFF_ATTACK, true) && urand(0, 1)) - triggered_spell_id = 71434; - target = pVictim; - break; - } case 71545: // Tiny Abomination in a Jar (Heroic) { if (!pVictim || !pVictim->isAlive()) @@ -6931,7 +6912,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger CastSpell(this, 71432, true, NULL, triggeredByAura); Aura const* dummy = GetAura(71432); - if (!dummy || dummy->GetStackAmount() < 7) + if (!dummy || dummy->GetStackAmount() < (dummySpell->Id == 71406 ? 8 : 7)) return false; RemoveAurasDueToSpell(71432); |