Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

Update Entity.cpp

Browse Source
This commit is contained in:
Emagi 2025-02-09 19:00:24 -05:00
parent 469487b35d
commit a22a56acc6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/WorldServer/Entity.cpp
View File

@ -135,7 +135,7 @@ void Entity::DeleteSpellEffects(bool removeClient)
if(deletedPtrs.find(GetInfoStruct()->spell_effects[i].spell) == deletedPtrs.end()) { if(deletedPtrs.find(GetInfoStruct()->spell_effects[i].spell) == deletedPtrs.end()) {
if(GetInfoStruct()->spell_effects[i].spell && GetInfoStruct()->spell_effects[i].spell->spell && if(GetInfoStruct()->spell_effects[i].spell && GetInfoStruct()->spell_effects[i].spell->spell &&
GetInfoStruct()->spell_effects[i].spell->spell->GetSpellData()->spell_book_type == SPELL_BOOK_TYPE_NOT_SHOWN) { GetInfoStruct()->spell_effects[i].spell->spell->GetSpellData()->spell_book_type == SPELL_BOOK_TYPE_NOT_SHOWN) {
deletedPtrs[GetInfoStruct()->spell_effects[i].spell] = true; deletedPtrs[GetInfoStruct()->spell_effects[i].spell] = false;
} }
} }
GetInfoStruct()->spell_effects[i].spell_id = 0xFFFFFFFF; GetInfoStruct()->spell_effects[i].spell_id = 0xFFFFFFFF;
@ -147,7 +147,10 @@ void Entity::DeleteSpellEffects(bool removeClient)
map<LuaSpell*,bool>::iterator deletedPtrItrs; map<LuaSpell*,bool>::iterator deletedPtrItrs;
for(deletedPtrItrs = deletedPtrs.begin(); deletedPtrItrs != deletedPtrs.end(); deletedPtrItrs++) { for(deletedPtrItrs = deletedPtrs.begin(); deletedPtrItrs != deletedPtrs.end(); deletedPtrItrs++) {
lua_interface->RemoveSpell(deletedPtrItrs->first, false, removeClient, "", removeClient); if(itr->second)
lua_interface->RemoveSpell(deletedPtrItrs->first, false, removeClient, "", removeClient, false, this);
else
lua_interface->RemoveSpell(deletedPtrItrs->first, false, removeClient, "", removeClient, true, this);
} }
} }