diff options
| author | QAston <qaston@gmail.com> | 2011-09-11 13:29:50 -0700 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-09-11 13:29:50 -0700 |
| commit | 606fd07cb1b3f8925a4261d5e9f69d5d7331ede3 (patch) | |
| tree | 36c386aaf69fae5c4ede9b0648c948e0f32cd103 /src | |
| parent | 7c856178478af894be0f73d38a5b3d09757eb721 (diff) | |
| parent | cd06a696cf97066f23060e8a83128c57ef7b1392 (diff) | |
Merge pull request #2966 from Chaplain/cleanup
Core/Auras: Improvements in SPELL_AURA_MOD_DAMAGE_PERCENT_DONE handling:
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 691a04cf668..617b0782f67 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10382,6 +10382,10 @@ uint32 Unit::SpellDamageBonus(Unit* victim, SpellInfo const* spellProto, uint32 AuraEffectList const& mModDamagePercentDone = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); for (AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i) + { + if (spellProto->EquippedItemClass == -1 && (*i)->GetSpellInfo()->EquippedItemClass != -1) //prevent apply mods from weapon specific case to non weapon specific spells (Example: thunder clap and two-handed weapon specialization) + continue; + if ((*i)->GetMiscValue() & spellProto->GetSchoolMask()) { if ((*i)->GetSpellInfo()->EquippedItemClass == -1) @@ -10391,6 +10395,7 @@ uint32 Unit::SpellDamageBonus(Unit* victim, SpellInfo const* spellProto, uint32 else if (ToPlayer() && ToPlayer()->HasItemFitToSpellRequirements((*i)->GetSpellInfo())) AddPctN(DoneTotalMod, (*i)->GetAmount()); } + } uint32 creatureTypeMask = victim->GetCreatureTypeMask(); // Add flat bonus from spell damage versus |