EQ2/Emu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

assure we remove the spell from all targets even if the caster is not set/present

Browse Source
This commit is contained in:
Emagi 2025-08-21 08:59:48 -04:00
parent 14a03bf255
commit 765a110732
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
source/WorldServer/SpellProcess.cpp
View File

@ -460,38 +460,41 @@ bool SpellProcess::DeleteCasterSpell(LuaSpell* spell, string reason, bool removi
return target_valid; return target_valid;
} }
if (!zone_shutting_down && spell->caster) { // spell->caster ptr cannot be trusted during zone shutdown if (!zone_shutting_down && spell->caster) { // spell->caster ptr cannot be trusted during zone shutdown
if(spell->caster->GetThreatTransfer() && spell->caster->GetThreatTransfer()->Spell == spell) { if(spell->caster) {
spell->caster->SetThreatTransfer(nullptr); if(spell->caster->GetThreatTransfer() && spell->caster->GetThreatTransfer()->Spell == spell) {
} spell->caster->SetThreatTransfer(nullptr);
if (spell->spell && spell->spell->GetSpellData()->cast_type == SPELL_CAST_TYPE_TOGGLE){ }
if (spell->spell && spell->spell->GetSpellData()->cast_type == SPELL_CAST_TYPE_TOGGLE){
int8 actual_concentration = spell->spell->GetSpellData()->req_concentration;
int8 actual_concentration = spell->spell->GetSpellData()->req_concentration;
if (actual_concentration > 0) if (actual_concentration > 0)
{
int8 curConcentration = spell->caster->GetInfoStruct()->get_cur_concentration();
if(curConcentration >= actual_concentration)
{ {
spell->caster->GetInfoStruct()->set_cur_concentration(curConcentration - actual_concentration); int8 curConcentration = spell->caster->GetInfoStruct()->get_cur_concentration();
if (spell->caster->IsPlayer()&& spell->caster->GetZone()) if(curConcentration >= actual_concentration)
spell->caster->GetZone()->TriggerCharSheetTimer(); {
spell->caster->GetInfoStruct()->set_cur_concentration(curConcentration - actual_concentration);
if (spell->caster->IsPlayer()&& spell->caster->GetZone())
spell->caster->GetZone()->TriggerCharSheetTimer();
}
}
if(!spell->spell->GetSpellData()->duration_until_cancel)
{
CheckRecast(spell->spell, spell->caster);
if (spell->caster && spell->caster->IsPlayer())
SendSpellBookUpdate(((Player*)spell->caster)->GetClient());
} }
} }
if(!spell->spell->GetSpellData()->duration_until_cancel) if(spell->spell && IsReady(spell->spell, spell->caster) && spell->caster->IsPlayer()) {
{ ((Player*)spell->caster)->UnlockSpell(spell->spell);
CheckRecast(spell->spell, spell->caster); SendSpellBookUpdate(((Player*)spell->caster)->GetClient());
if (spell->caster && spell->caster->IsPlayer())
SendSpellBookUpdate(((Player*)spell->caster)->GetClient());
} }
}
if(spell->spell && IsReady(spell->spell, spell->caster) && spell->caster->IsPlayer()) { spell->caster->RemoveProc(0, spell);
((Player*)spell->caster)->UnlockSpell(spell->spell); spell->caster->RemoveMaintainedSpell(spell);
SendSpellBookUpdate(((Player*)spell->caster)->GetClient()); CheckRemoveTargetFromSpell(spell, removing_all_spells, removing_all_spells);
} }
spell->caster->RemoveProc(0, spell);
spell->caster->RemoveMaintainedSpell(spell);
CheckRemoveTargetFromSpell(spell, removing_all_spells, removing_all_spells);
ZoneServer* zone = spell->zone; ZoneServer* zone = spell->zone;
if(zone) { if(zone) {
LogWrite(SPELL__DEBUG, 0, "Spell", "SpellProcess::DeleteCasterSpell RemoveTargets Spell: %s.", LogWrite(SPELL__DEBUG, 0, "Spell", "SpellProcess::DeleteCasterSpell RemoveTargets Spell: %s.",