Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

active spells updates

Browse Source
This commit is contained in:
Emagi 2024-09-22 21:11:48 -04:00
parent 1b2983d376
commit e7a187cf86
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/WorldServer/SpellProcess.cpp
View File

@ -445,9 +445,6 @@ bool SpellProcess::DeleteCasterSpell(LuaSpell* spell, string reason, bool removi
return target_valid; return target_valid;
} }
spell->MSpellTargets.releasewritelock(__FUNCTION__, __LINE__); spell->MSpellTargets.releasewritelock(__FUNCTION__, __LINE__);
if (active_spells.count(spell) > 0)
active_spells.Remove(spell);
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->GetThreatTransfer() && spell->caster->GetThreatTransfer()->Spell == spell) {
spell->caster->SetThreatTransfer(nullptr); spell->caster->SetThreatTransfer(nullptr);
@ -3023,7 +3020,7 @@ void SpellProcess::AddSelfAndPetToCharTargets(LuaSpell* spell, Spawn* caster, bo
void SpellProcess::DeleteActiveSpell(LuaSpell* spell) { void SpellProcess::DeleteActiveSpell(LuaSpell* spell) {
lua_interface->RemoveCurrentSpell(spell->state, spell, true); lua_interface->RemoveCurrentSpell(spell->state, spell, true);
active_spells.Remove(spell, true); active_spells.Remove(spell, true, 2000);
} }
bool SpellProcess::AddLuaSpellTarget(LuaSpell* lua_spell, int32 id, bool lock_spell_targets) { bool SpellProcess::AddLuaSpellTarget(LuaSpell* lua_spell, int32 id, bool lock_spell_targets) {