Sky/EQ2Emu
1
0
Fork 0
Code Issues Activity

Fixed RemoveProc to work without Spawn argument

Browse Source
This commit is contained in:
Emagi 2024-09-24 07:33:54 -04:00
parent a056ef7b41
commit c20f97faa5
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/WorldServer/LuaFunctions.cpp
View File

@ -8682,18 +8682,6 @@ int EQ2Emu_lua_RemoveProc(lua_State* state) {
Item* item = lua_interface->GetItem(state, 2); Item* item = lua_interface->GetItem(state, 2);
LuaSpell* spell = 0; LuaSpell* spell = 0;
if (!spawn) {
lua_interface->LogError("%s: LUA RemoveProc command error: spawn is not valid", lua_interface->GetScriptName(state));
lua_interface->ResetFunctionStack(state);
return 0;
}
if (!spawn->IsEntity()) {
lua_interface->LogError("%s: LUA RemoveProc command error: spawn is not a valid entity", lua_interface->GetScriptName(state));
lua_interface->ResetFunctionStack(state);
return 0;
}
if (!item) if (!item)
spell = lua_interface->GetCurrentSpell(state); spell = lua_interface->GetCurrentSpell(state);
@ -8717,9 +8705,17 @@ int EQ2Emu_lua_RemoveProc(lua_State* state) {
spell->MSpellTargets.releasereadlock(__FUNCTION__, __LINE__); spell->MSpellTargets.releasereadlock(__FUNCTION__, __LINE__);
spell->caster->RemoveProc(item, spell); spell->caster->RemoveProc(item, spell);
} }
else else if (!spawn) {
lua_interface->LogError("%s: LUA RemoveProc command error: spawn is not valid", lua_interface->GetScriptName(state));
return 0;
}
else if (!spawn->IsEntity()) {
lua_interface->LogError("%s: LUA RemoveProc command error: spawn is not a valid entity", lua_interface->GetScriptName(state));
return 0;
}
else {
((Entity*)spawn)->RemoveProc(item, spell); ((Entity*)spawn)->RemoveProc(item, spell);
}
return 0; return 0;
} }