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

Fixed CheckRemoveTargetFromSpell we should handle RemoveSpawnFromSpell outside MRemoveTargetList lock

Browse Source
This commit is contained in:
Emagi 2025-06-23 13:19:12 -04:00
parent e54ed5e730
commit 11a6a80647
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/WorldServer/SpellProcess.cpp
View File

@ -2809,7 +2809,6 @@ void SpellProcess::CheckRemoveTargetFromSpell(LuaSpell* spell, bool allow_delete
if (remove_spawn->GetID() == id) { if (remove_spawn->GetID() == id) {
found_target = true; found_target = true;
spell->RemoveTarget(id); spell->RemoveTarget(id);
lua_interface->RemoveSpawnFromSpell(spell, remove_spawn);
LogWrite(SPELL__DEBUG, 0, "Spell", "%s CheckRemoveTargetFromSpell %s (%u).", spell->spell->GetName(), remove_spawn->GetName(), remove_spawn->GetID()); LogWrite(SPELL__DEBUG, 0, "Spell", "%s CheckRemoveTargetFromSpell %s (%u).", spell->spell->GetName(), remove_spawn->GetName(), remove_spawn->GetID());
if(remove_spawn && std::find(spawnsToRemove.begin(), spawnsToRemove.end(), remove_spawn) == spawnsToRemove.end()) if(remove_spawn && std::find(spawnsToRemove.begin(), spawnsToRemove.end(), remove_spawn) == spawnsToRemove.end())
spawnsToRemove.push_back(remove_spawn); spawnsToRemove.push_back(remove_spawn);
@ -2838,8 +2837,7 @@ void SpellProcess::CheckRemoveTargetFromSpell(LuaSpell* spell, bool allow_delete
Spawn* target = spawnsToRemove.at(s); Spawn* target = spawnsToRemove.at(s);
if(target) { if(target) {
bool not_last_itr = (s != spawnsToRemove.size() - 1); bool not_last_itr = (s != spawnsToRemove.size() - 1);
if(target->IsEntity()) lua_interface->RemoveSpawnFromSpell(spell, target);
((Entity*)target)->RemoveEffectsFromLuaSpell(spell);
if(targets_empty && allow_delete) { if(targets_empty && allow_delete) {
lua_interface->RemoveSpell(spell, true, false, !target->Alive() ? "target_dead" : "target_removed", false, not_last_itr, target); lua_interface->RemoveSpell(spell, true, false, !target->Alive() ? "target_dead" : "target_removed", false, not_last_itr, target);
} }