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

fix(Scripts/ScarletEnclave): fix crash in Persuasive Strike spell script (#22840)

Browse source
This commit is contained in:
Andrew 2025-09-09 13:43:04 -03:00 • committed by GitHub
parent 24ee9e248b
commit 3a1f43db5c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
View file

@ -1001,20 +1001,25 @@ class spell_chapter2_persuasive_strike : public SpellScript
creature->AI()->Talk(SAY_PERSUADED3, 24s);
creature->AI()->Talk(SAY_PERSUADED4, 32s);
creature->m_Events.AddEventAtOffset([creature, player]
ObjectGuid playerGuid = player->GetGUID();
creature->m_Events.AddEventAtOffset([creature, playerGuid]
{
if (player)
sCreatureTextMgr->SendChat(creature, SAY_PERSUADED5, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_NEUTRAL, false, player);
if (Player* caster = ObjectAccessor::GetPlayer(*creature, playerGuid))
sCreatureTextMgr->SendChat(creature, SAY_PERSUADED5, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_NORMAL, 0, TEAM_NEUTRAL, false, caster);
}, 40s);
creature->m_Events.AddEventAtOffset([creature, player]
creature->m_Events.AddEventAtOffset([creature, playerGuid]
{
creature->AI()->Talk(SAY_PERSUADED6);
if (player)
if (Player* caster = ObjectAccessor::GetPlayer(*creature, playerGuid))
{
Unit::Kill(player, creature);
player->GroupEventHappens(QUEST_HOW_TO_WIN_FRIENDS, creature);
Unit::Kill(caster, creature);
caster->GroupEventHappens(QUEST_HOW_TO_WIN_FRIENDS, creature);
}
else
creature->KillSelf();
}, 48s);
}
else