josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2920 from Chaplain/cleanup

Browse Source 
Core/Auras: Improvements in SPELL_AURA_MOD_DAMAGE_PERCENT_DONE handling: 
* Weapon specific case for MOD_DAMAGE_DONE_PCT shouldn't change PLAYER_FIELD_MOD_DAMAGE_DONE_PCT, because PLAYER_FIELD_MOD_DAMAGE_DONE_PCT applyed for _all_ damage that deal target.
* Fixed applying SPELL_AURA_MOD_DAMAGE_PERCENT_DONE for SpellDamageBonus.
This commit is contained in:
QAston
2011-09-06 02:37:21 -07:00
parent 94126e0369 207f598a20
commit dad9d07045
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
-2
View File
@@ -8090,8 +8090,6 @@ void Player::_ApplyWeaponDependentAuraDamageMod(Item *item, WeaponAttackType att
HandleStatModifier(unitMod, unitModType, float(aura->GetAmount()), apply); HandleStatModifier(unitMod, unitModType, float(aura->GetAmount()), apply);
if (unitModType == TOTAL_VALUE) if (unitModType == TOTAL_VALUE)
ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS, aura->GetAmount(), apply); ApplyModUInt32Value(PLAYER_FIELD_MOD_DAMAGE_DONE_POS, aura->GetAmount(), apply);
else
ApplyPercentModFloatValue(PLAYER_FIELD_MOD_DAMAGE_DONE_PCT, float (aura->GetAmount()), apply);
} }
} }
src/server/game/Entities/Unit/Unit.cpp
+1 -1
View File
@@ -10368,7 +10368,7 @@ uint32 Unit::SpellDamageBonus(Unit* victim, SpellInfo const* spellProto, uint32
AuraEffectList const& mModDamagePercentDone = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE); AuraEffectList const& mModDamagePercentDone = GetAuraEffectsByType(SPELL_AURA_MOD_DAMAGE_PERCENT_DONE);
for (AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i) for (AuraEffectList::const_iterator i = mModDamagePercentDone.begin(); i != mModDamagePercentDone.end(); ++i)
if ((*i)->GetMiscValue() & spellProto->GetSchoolMask() && !(spellProto->GetSchoolMask() & SPELL_SCHOOL_MASK_NORMAL)) if ((*i)->GetMiscValue() & spellProto->GetSchoolMask())
{ {
if ((*i)->GetSpellInfo()->EquippedItemClass == -1) if ((*i)->GetSpellInfo()->EquippedItemClass == -1)
AddPctN(DoneTotalMod, (*i)->GetAmount()); AddPctN(DoneTotalMod, (*i)->GetAmount());
src/server/game/Spells/Auras/SpellAuraEffects.cpp
+1 -1
View File
@@ -4522,7 +4522,7 @@ void AuraEffect::HandleModDamagePercentDone(AuraApplication const* aurApp, uint8
} }
else else
{ {
// done in Player::_ApplyWeaponDependentAuraMods for !SPELL_SCHOOL_MASK_NORMAL and also for wand case // done in Player::_ApplyWeaponDependentAuraMods for SPELL_SCHOOL_MASK_NORMAL && EquippedItemClass != -1 and also for wand case
} }
} }