ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

fix(Scripts/Spells): Shadow Vault Decree engages Thane Ufrang (#25645)

Browse source 
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Andrew 2026-04-28 21:31:00 -03:00 • committed by GitHub
parent 0ecbe4a704
commit e32249f926
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
data/sql/updates/pending_db_world/rev_1777417304651314500.sql Normal file
View file

@ -0,0 +1,20 @@
--
-- Quest 12943 "Shadow Vault Decree" - Thane Ufrang the Mighty (29919)
--
-- The CheckCast "Thane is nearby" check moves out of spell_q12943_shadow_vault_decree
-- and into a CONDITION_NEAR_CREATURE on spell 31696. The script now also clears
-- Thane's idle unit flags via ReplaceAllUnitFlags before calling AttackStart, so
-- combat actually engages instead of the player getting stuck unable to attack.
--
-- The old SAI "Remove Unit Flags" action (id 6) chained off the 12s "Say Line 4"
-- timer is removed - the C++ handles flag removal at cast time.
--
-- Cast-time precondition: Thane (alive) must be within 30y of the caster.
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 17 AND `SourceEntry` = 31696;
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
(17, 0, 31696, 0, 0, 29, 0, 29919, 30, 0, 0, 12, 0, '', 'Spell Shadow Vault Decree requires nearby Thane Ufrang the Mighty');
-- Drop the now-redundant linked Remove-Unit-Flags action and its parent's link to it.
UPDATE `smart_scripts` SET `link` = 0 WHERE `entryorguid` = 29919 AND `source_type` = 0 AND `id` = 5;
DELETE FROM `smart_scripts` WHERE `entryorguid` = 29919 AND `source_type` = 0 AND `id` = 6;

17
src/server/scripts/Spells/spell_quest.cpp
View file

@ -381,27 +381,20 @@ class spell_q12943_shadow_vault_decree : public SpellScript
{
PrepareSpellScript(spell_q12943_shadow_vault_decree);
SpellCastResult CheckRequirement()
{
// if thane is present and not in combat - allow cast
Unit* caster = GetCaster();
if (Creature* thane = caster->FindNearestCreature(NPC_THANE_UFRANG, 30.0f))
if (!thane->IsInCombat())
return SPELL_CAST_OK;
return SPELL_FAILED_CASTER_AURASTATE;
}
void HandleScriptEffect(SpellEffIndex /*effIndex*/)
{
Unit* caster = GetCaster();
if (Creature* thane = caster->FindNearestCreature(NPC_THANE_UFRANG, 30.0f))
{
if (thane->IsInCombat())
return;
thane->ReplaceAllUnitFlags(UNIT_FLAG_NONE);
thane->AI()->AttackStart(caster);
}
}
void Register() override
{
OnCheckCast += SpellCheckCastFn(spell_q12943_shadow_vault_decree::CheckRequirement);
OnEffectHitTarget += SpellEffectFn(spell_q12943_shadow_vault_decree::HandleScriptEffect, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};