From a5caf1af95a47c4ea8467a4f96ad04bb9ed9dceb Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 29 Aug 2021 02:13:16 +0200 Subject: [PATCH] Core/Units: removed now unused attacker argument from Unit::GetUnitCriticalChanceTaken --- src/server/game/Entities/Unit/Unit.cpp | 8 ++++---- src/server/game/Entities/Unit/Unit.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4cef735a47..db250bcc8a 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -2852,7 +2852,7 @@ float Unit::GetUnitCriticalChanceDone(WeaponAttackType attackType) const return chance; } -float Unit::GetUnitCriticalChanceTaken(Unit const* attacker, WeaponAttackType attackType, float critDone) const +float Unit::GetUnitCriticalChanceTaken(WeaponAttackType attackType, float critDone) const { float chance = critDone; @@ -2871,7 +2871,7 @@ float Unit::GetUnitCriticalChanceTaken(Unit const* attacker, WeaponAttackType at float Unit::GetUnitCriticalChanceAgainst(WeaponAttackType attackType, Unit const* victim) const { float chance = GetUnitCriticalChanceDone(attackType); - return victim->GetUnitCriticalChanceTaken(this, attackType, chance); + return victim->GetUnitCriticalChanceTaken(attackType, chance); } void Unit::_DeleteRemovedAuras() @@ -7282,7 +7282,7 @@ float Unit::SpellCritChanceTaken(Unit const* caster, SpellInfo const* spellInfo, break; } } - crit_chance = GetUnitCriticalChanceTaken(caster, attackType, crit_chance); + crit_chance = GetUnitCriticalChanceTaken(attackType, crit_chance); } break; case SPELL_DAMAGE_CLASS_NONE: @@ -7291,7 +7291,7 @@ float Unit::SpellCritChanceTaken(Unit const* caster, SpellInfo const* spellInfo, } // for this types the bonus was already added in GetUnitCriticalChance, do not add twice - if (caster && spellInfo->DmgClass != SPELL_DAMAGE_CLASS_MELEE && spellInfo->DmgClass != SPELL_DAMAGE_CLASS_RANGED) + if (caster) { crit_chance += GetTotalAuraModifier(SPELL_AURA_MOD_CRIT_CHANCE_FOR_CASTER, [caster, spellInfo](AuraEffect const* aurEff) -> bool { diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 6985f65bfd..ff80b90bba 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -1026,7 +1026,7 @@ class TC_GAME_API Unit : public WorldObject float GetUnitBlockChance(Unit const* victim) const; float GetUnitMissChance(Unit const* victim) const; float GetUnitCriticalChanceDone(WeaponAttackType attackType) const; - float GetUnitCriticalChanceTaken(Unit const* attacker, WeaponAttackType attackType, float critDone) const; + float GetUnitCriticalChanceTaken(WeaponAttackType attackType, float critDone) const; float GetUnitCriticalChanceAgainst(WeaponAttackType attackType, Unit const* victim) const; int32 GetMechanicResistChance(SpellInfo const* spellInfo) const; bool CanUseAttackType(uint8 attacktype) const;