diff options
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 11 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 2 |
4 files changed, 10 insertions, 7 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 5b0bebe4344..51f897e9b05 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5201,9 +5201,9 @@ void Player::SetBaseModPctValue(BaseModGroup modGroup, float val) UpdateBaseModGroup(modGroup); } -void Player::UpdateDamageDoneMods(WeaponAttackType attackType) +void Player::UpdateDamageDoneMods(WeaponAttackType attackType, int32 skipEnchantSlot /*= -1*/) { - Unit::UpdateDamageDoneMods(attackType); + Unit::UpdateDamageDoneMods(attackType, skipEnchantSlot); UnitMods unitMod; switch (attackType) @@ -5229,6 +5229,9 @@ void Player::UpdateDamageDoneMods(WeaponAttackType attackType) for (uint8 slot = 0; slot < MAX_ENCHANTMENT_SLOT; ++slot) { + if (skipEnchantSlot == slot) + continue; + SpellItemEnchantmentEntry const* enchantmentEntry = sSpellItemEnchantmentStore.LookupEntry(item->GetEnchantmentId(EnchantmentSlot(slot))); if (!enchantmentEntry) continue; @@ -13684,7 +13687,7 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool { WeaponAttackType const attackType = Player::GetAttackBySlot(item->GetSlot()); if (attackType != MAX_ATTACK) - UpdateDamageDoneMods(attackType); + UpdateDamageDoneMods(attackType, apply ? -1 : slot); break; } case ITEM_ENCHANTMENT_TYPE_EQUIP_SPELL: @@ -13952,7 +13955,7 @@ void Player::ApplyEnchantment(Item* item, EnchantmentSlot slot, bool apply, bool { WeaponAttackType const attackType = Player::GetAttackBySlot(item->GetSlot()); if (attackType != MAX_ATTACK) - UpdateDamageDoneMods(attackType); + UpdateDamageDoneMods(attackType, apply ? -1 : slot); break; } case ITEM_ENCHANTMENT_TYPE_USE_SPELL: diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 9736b02eb6f..71e3ff8519d 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1803,7 +1803,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> void SetBaseModFlatValue(BaseModGroup modGroup, float val); void SetBaseModPctValue(BaseModGroup modGroup, float val); - void UpdateDamageDoneMods(WeaponAttackType attackType) override; + void UpdateDamageDoneMods(WeaponAttackType attackType, int32 skipEnchantSlot = -1) override; void UpdateBaseModGroup(BaseModGroup modGroup); float GetBaseModValue(BaseModGroup modGroup, BaseModType modType) const; diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 67fabb9d041..d424210000f 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -9047,7 +9047,7 @@ void Unit::UpdateUnitMod(UnitMods unitMod) } } -void Unit::UpdateDamageDoneMods(WeaponAttackType attackType) +void Unit::UpdateDamageDoneMods(WeaponAttackType attackType, int32 /*skipEnchantSlot = -1*/) { UnitMods unitMod; switch (attackType) diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index f2a7e986a58..f8832dff52a 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1402,7 +1402,7 @@ class TC_GAME_API Unit : public WorldObject // only players have item requirements virtual bool CheckAttackFitToAuraRequirement(WeaponAttackType /*attackType*/, AuraEffect const* /*aurEff*/) const { return true; } - virtual void UpdateDamageDoneMods(WeaponAttackType attackType); + virtual void UpdateDamageDoneMods(WeaponAttackType attackType, int32 skipEnchantSlot = -1); void UpdateAllDamageDoneMods(); void UpdateDamagePctDoneMods(WeaponAttackType attackType); |