From 83adff44e41ae57fb2f86d2b913f359a7da3e2b8 Mon Sep 17 00:00:00 2001 From: Tereneckla Date: Sat, 10 May 2025 19:51:30 +0200 Subject: [PATCH] fix(Spells/Paladin) remove custom cooldown and procFlags from Judgement of Wisdom/Light (#22018) --- .../updates/pending_db_world/rev_1745955461043147883.sql | 2 ++ src/server/game/Entities/Unit/Unit.cpp | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1745955461043147883.sql diff --git a/data/sql/updates/pending_db_world/rev_1745955461043147883.sql b/data/sql/updates/pending_db_world/rev_1745955461043147883.sql new file mode 100644 index 000000000..342aa32ed --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1745955461043147883.sql @@ -0,0 +1,2 @@ +-- +UPDATE `spell_proc_event` SET `procFlags` = 0 WHERE `entry` IN (20186, 20185); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index bd4c9252a..c0bb9e8db 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -7826,7 +7826,7 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // Judgement of Light case 20185: { - if (!victim || !victim->IsAlive() || victim->HasSpellCooldown(20267)) + if (!victim || !victim->IsAlive()) return false; auto* caster = triggeredByAura->GetBase()->GetCaster(); @@ -7836,13 +7836,12 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // 2% of base health basepoints0 = int32(victim->CountPctFromMaxHealth(2)); victim->CastCustomSpell(victim, 20267, &basepoints0, 0, 0, true, 0, triggeredByAura); - victim->AddSpellCooldown(20267, 0, 4 * IN_MILLISECONDS); return true; } // Judgement of Wisdom case 20186: { - if (!victim || !victim->IsAlive() || !victim->HasActivePowerType(POWER_MANA) || victim->HasSpellCooldown(20268)) + if (!victim || !victim->IsAlive() || !victim->HasActivePowerType(POWER_MANA)) return false; auto* caster = triggeredByAura->GetBase()->GetCaster(); @@ -7852,7 +7851,6 @@ bool Unit::HandleDummyAuraProc(Unit* victim, uint32 damage, AuraEffect* triggere // 2% of base mana basepoints0 = int32(CalculatePct(victim->GetCreateMana(), 2)); victim->CastCustomSpell(victim, 20268, &basepoints0, nullptr, nullptr, true, 0, triggeredByAura); - victim->AddSpellCooldown(20268, 0, 4 * IN_MILLISECONDS); return true; } // Holy Power (Redemption Armor set)