aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/master/2025_10_24_00_world.sql1
-rw-r--r--src/server/scripts/Spells/spell_priest.cpp13
2 files changed, 2 insertions, 12 deletions
diff --git a/sql/updates/world/master/2025_10_24_00_world.sql b/sql/updates/world/master/2025_10_24_00_world.sql
new file mode 100644
index 00000000000..d31ccb749e8
--- /dev/null
+++ b/sql/updates/world/master/2025_10_24_00_world.sql
@@ -0,0 +1 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=214206;
diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index 85206269d6f..b558ac9c91e 100644
--- a/src/server/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
@@ -513,8 +513,6 @@ class spell_pri_atonement_effect : public SpellScript
({
SPELL_PRIEST_ATONEMENT,
SPELL_PRIEST_ATONEMENT_EFFECT,
- SPELL_PRIEST_TRINITY,
- SPELL_PRIEST_TRINITY_EFFECT,
SPELL_PRIEST_POWER_WORD_RADIANCE,
SPELL_PRIEST_POWER_WORD_SHIELD
}) && ValidateSpellEffect({
@@ -529,15 +527,6 @@ class spell_pri_atonement_effect : public SpellScript
if (!caster->HasAura(SPELL_PRIEST_ATONEMENT))
return false;
- // only apply Trinity if the Priest has both Trinity and Atonement and the triggering spell is Power Word: Shield.
- if (caster->HasAura(SPELL_PRIEST_TRINITY))
- {
- if (GetSpellInfo()->Id != SPELL_PRIEST_POWER_WORD_SHIELD)
- return false;
-
- _effectSpellId = SPELL_PRIEST_TRINITY_EFFECT;
- }
-
return true;
}
@@ -577,7 +566,7 @@ class spell_pri_atonement_effect : public SpellScript
uint32 _effectSpellId = SPELL_PRIEST_ATONEMENT_EFFECT;
};
-// 194384 - Atonement (Buff), 214206 - Atonement [Trinity] (Buff)
+// 194384 - Atonement (Buff)
class spell_pri_atonement_effect_aura : public AuraScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override