From 5e1fd50776fc1b1908a58a6db900ee9d1d48aa7f Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Fri, 20 Feb 2026 18:48:08 -0600 Subject: [PATCH] fix(Core/Scripts): Prevent Judgement of Light from triggering Beacon of Light (#24781) Co-authored-by: blinkysc --- src/server/scripts/Spells/spell_paladin.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 89a3a571a..d9c228867 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -2218,12 +2218,18 @@ class spell_pal_light_s_beacon : public AuraScript SPELL_PALADIN_BEACON_OF_LIGHT_AURA, SPELL_PALADIN_BEACON_OF_LIGHT_FLASH, SPELL_PALADIN_BEACON_OF_LIGHT_HOLY, - SPELL_PALADIN_HOLY_LIGHT_R1 + SPELL_PALADIN_HOLY_LIGHT_R1, + SPELL_PALADIN_JUDGEMENT_OF_LIGHT_HEAL }); } bool CheckProc(ProcEventInfo& eventInfo) { + // Don't proc from Judgement of Light heals — JoL sets originalCaster to + // the paladin for combat log, but the heal is actually cast by the attacker. + if (eventInfo.GetSpellInfo() && eventInfo.GetSpellInfo()->Id == SPELL_PALADIN_JUDGEMENT_OF_LIGHT_HEAL) + return false; + // Don't proc if the heal target is the beacon target (no double heal) if (GetTarget()->HasAura(SPELL_PALADIN_BEACON_OF_LIGHT_AURA, eventInfo.GetActor()->GetGUID())) return false;