diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index de39e859cb..b90ff65876 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11234,17 +11234,21 @@ void Unit::ApplyHasteRegenMod(WeaponAttackType att, float val, bool apply) ToPlayer()->UpdatePowerRegeneration(POWER_RUNE); } -void Unit::ApplyCastTimePercentMod(float val, bool apply) +void Unit::ApplyCastTimePercentMod(float val, bool apply, bool withCastHaste /*= true*/, bool withCastSpeed /*= true*/) { if (val > 0) { - ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED, val, !apply); - ApplyPercentModFloatValue(UNIT_MOD_CAST_HASTE, val, !apply); + if (withCastSpeed) + ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED, val, !apply); + if (withCastHaste) + ApplyPercentModFloatValue(UNIT_MOD_CAST_HASTE, val, !apply); } else { - ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED, -val, apply); - ApplyPercentModFloatValue(UNIT_MOD_CAST_HASTE, -val, apply); + if (withCastSpeed) + ApplyPercentModFloatValue(UNIT_MOD_CAST_SPEED, -val, apply); + if (withCastHaste) + ApplyPercentModFloatValue(UNIT_MOD_CAST_HASTE, -val, apply); } } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 1118219c9f..5650741bd1 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -945,7 +945,7 @@ class TC_GAME_API Unit : public WorldObject void SetAttackTime(WeaponAttackType att, uint32 val) { SetFloatValue(UNIT_FIELD_BASEATTACKTIME+att, val*m_modAttackSpeedPct[att]); } void ApplyAttackTimePercentMod(WeaponAttackType att, float val, bool apply); void ApplyHasteRegenMod(WeaponAttackType att, float val, bool apply); - void ApplyCastTimePercentMod(float val, bool apply); + void ApplyCastTimePercentMod(float val, bool apply, bool withCastHaste = true, bool withCastSpeed = true); SheathState GetSheath() const { return SheathState(GetByteValue(UNIT_FIELD_BYTES_2, UNIT_BYTES_2_OFFSET_SHEATH_STATE)); } virtual void SetSheath(SheathState sheathed); diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 69a16d2595..e3fe002d32 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -4030,6 +4030,10 @@ void AuraEffect::HandleAuraModCritPct(AuraApplication const* aurApp, uint8 mode, /*** ATTACK SPEED ***/ /********************************/ +// There are some SPELL_AURA_MOD_CASTING_SPEED_NOT_STACK effects which cause spells to become instant casts. +// In this case we do not want these effects to affect the global haste of spells but only the casting time. +static constexpr uint16 CAST_HASTE_AMOUNT_THRESHOLD = 1000; + void AuraEffect::HandleModCastingSpeed(AuraApplication const* aurApp, uint8 mode, bool apply) const { if (!(mode & (AURA_EFFECT_HANDLE_CHANGE_AMOUNT_MASK | AURA_EFFECT_HANDLE_STAT))) @@ -4042,9 +4046,9 @@ void AuraEffect::HandleModCastingSpeed(AuraApplication const* aurApp, uint8 mode return; if (spellGroupVal) - target->ApplyCastTimePercentMod((float)GetAmount(), !apply); + target->ApplyCastTimePercentMod((float)GetAmount(), !apply, GetAmount() < CAST_HASTE_AMOUNT_THRESHOLD); - target->ApplyCastTimePercentMod((float)GetAmount(), apply); + target->ApplyCastTimePercentMod((float)GetAmount(), apply, GetAmount() < CAST_HASTE_AMOUNT_THRESHOLD); } void AuraEffect::HandleModMeleeRangedSpeedPct(AuraApplication const* aurApp, uint8 mode, bool apply) const