Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-19 08:30:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Remove separate Forbearance checks from paladin scripts, not neccessary since serverside spells were reimplemented

Browse Source
This commit is contained in:
Shauren
2025-02-17 19:10:03 +01:00
parent 8684e86353
commit fd2574fc3c
2 changed files with 23 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/master/2025_02_17_03_world.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM `spell_linked_spell` WHERE ABS(`spell_trigger`) = 25771;
INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
(25771, 61988, 2, 'Forbearance - link duration of serverside Divine Shield Exclude Aura ');

74
src/server/scripts/Spells/spell_paladin.cpp
View File

@@ -351,32 +351,20 @@ class spell_pal_blessing_of_protection : public SpellScript
return ValidateSpellInfo(
{
SPELL_PALADIN_FORBEARANCE,
// uncomment when we have serverside only spells
//SPELL_PALADIN_IMMUNE_SHIELD_MARKER
SPELL_PALADIN_IMMUNE_SHIELD_MARKER
}) && spellInfo->ExcludeTargetAuraSpell == SPELL_PALADIN_IMMUNE_SHIELD_MARKER;
}
SpellCastResult CheckForbearance()
void TriggerForbearance() const
{
Unit* target = GetExplTargetUnit();
if (!target || target->HasAura(SPELL_PALADIN_FORBEARANCE))
return SPELL_FAILED_TARGET_AURASTATE;
return SPELL_CAST_OK;
}
void TriggerForbearance()
{
if (Unit* target = GetHitUnit())
{
GetCaster()->CastSpell(target, SPELL_PALADIN_FORBEARANCE, true);
GetCaster()->CastSpell(target, SPELL_PALADIN_IMMUNE_SHIELD_MARKER, true);
}
GetCaster()->CastSpell(GetHitUnit(), SPELL_PALADIN_FORBEARANCE, CastSpellExtraArgsInit{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
.TriggeringSpell = GetSpell()
});
}
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_pal_blessing_of_protection::CheckForbearance);
AfterHit += SpellHitFn(spell_pal_blessing_of_protection::TriggerForbearance);
}
};
@@ -544,37 +532,28 @@ class spell_pal_divine_shield : public SpellScript
SPELL_PALADIN_FINAL_STAND,
SPELL_PALADIN_FINAL_STAND_EFFECT,
SPELL_PALADIN_FORBEARANCE,
// uncomment when we have serverside only spells
//SPELL_PALADIN_IMMUNE_SHIELD_MARKER
SPELL_PALADIN_IMMUNE_SHIELD_MARKER
}) && spellInfo->ExcludeCasterAuraSpell == SPELL_PALADIN_IMMUNE_SHIELD_MARKER;
}
SpellCastResult CheckForbearance()
{
if (GetCaster()->HasAura(SPELL_PALADIN_FORBEARANCE))
return SPELL_FAILED_TARGET_AURASTATE;
return SPELL_CAST_OK;
}
void HandleFinalStand()
{
if (GetCaster()->HasAura(SPELL_PALADIN_FINAL_STAND))
GetCaster()->CastSpell(nullptr, SPELL_PALADIN_FINAL_STAND_EFFECT, true);
}
void TriggerForbearance()
void TriggerForbearance() const
{
Unit* caster = GetCaster();
caster->CastSpell(caster, SPELL_PALADIN_FORBEARANCE, true);
caster->CastSpell(caster, SPELL_PALADIN_IMMUNE_SHIELD_MARKER, true);
GetCaster()->CastSpell(GetHitUnit(), SPELL_PALADIN_FORBEARANCE, CastSpellExtraArgsInit{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
.TriggeringSpell = GetSpell()
});
}
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_pal_divine_shield::CheckForbearance);
AfterCast += SpellCastFn(spell_pal_divine_shield::HandleFinalStand);
AfterCast += SpellCastFn(spell_pal_divine_shield::TriggerForbearance);
AfterHit += SpellHitFn(spell_pal_divine_shield::TriggerForbearance);
}
};
@@ -1264,35 +1243,22 @@ class spell_pal_item_t6_trinket : public AuraScript
// 471195 - Lay on Hands (from 387791 - Empyreal Ward)
class spell_pal_lay_on_hands : public SpellScript
{
bool Validate(SpellInfo const* /*spellInfo*/) override
bool Validate(SpellInfo const* spellInfo) override
{
return ValidateSpellInfo({ SPELL_PALADIN_FORBEARANCE, SPELL_PALADIN_IMMUNE_SHIELD_MARKER });
}
SpellCastResult CheckForbearance() const
{
Unit* target = GetExplTargetUnit();
if (!target || target->HasAura(SPELL_PALADIN_FORBEARANCE))
return SPELL_FAILED_TARGET_AURASTATE;
return SPELL_CAST_OK;
return ValidateSpellInfo({ SPELL_PALADIN_FORBEARANCE })
&& spellInfo->ExcludeTargetAuraSpell == SPELL_PALADIN_IMMUNE_SHIELD_MARKER;
}
void TriggerForbearance() const
{
if (Unit* target = GetHitUnit())
{
CastSpellExtraArgs args(TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR);
args.SetTriggeringSpell(GetSpell());
GetCaster()->CastSpell(target, SPELL_PALADIN_FORBEARANCE, args);
GetCaster()->CastSpell(target, SPELL_PALADIN_IMMUNE_SHIELD_MARKER, args);
}
GetCaster()->CastSpell(GetHitUnit(), SPELL_PALADIN_FORBEARANCE, CastSpellExtraArgsInit{
.TriggerFlags = TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_DONT_REPORT_CAST_ERROR,
.TriggeringSpell = GetSpell()
});
}
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_pal_lay_on_hands::CheckForbearance);
AfterHit += SpellHitFn(spell_pal_lay_on_hands::TriggerForbearance);
}
};