Techwizz/EQ2EMu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix GetEquippedItemBySlot can be used by entities, not just players

Browse source
This commit is contained in:
Emagi 2022-11-20 13:38:41 -05:00
parent fcaa9792db
commit a32ffa1c81
1 changed files with 5 additions and 5 deletions

10
EQ2/source/WorldServer/LuaFunctions.cpp
View file

@ -6570,19 +6570,19 @@ int EQ2Emu_lua_HasItemEquipped(lua_State* state) {
int EQ2Emu_lua_GetEquippedItemBySlot(lua_State* state) {
if (!lua_interface)
return 0;
Spawn* player = lua_interface->GetSpawn(state);
Spawn* spawn = lua_interface->GetSpawn(state);
int8 slot = lua_interface->GetInt8Value(state, 2);
lua_interface->ResetFunctionStack(state);
if (!player) {
if (!spawn) {
lua_interface->LogError("%s: LUA GetEquippedItemBySlot command error: spawn is not valid", lua_interface->GetScriptName(state));
return 0;
}
if (!player->IsPlayer()) {
lua_interface->LogError("%s: LUA GetEquippedItemBySlot command error: spawn is not player", lua_interface->GetScriptName(state));
if (!spawn->IsEntity()) {
lua_interface->LogError("%s: LUA GetEquippedItemBySlot command error: spawn is not an entity", lua_interface->GetScriptName(state));
return 0;
}
Item* item = ((Player*)player)->GetEquipmentList()->GetItem(slot);
Item* item = ((Entity*)spawn)->GetEquipmentList()->GetItem(slot);
if (!item) {
lua_interface->LogError("%s: LUA GetEquippedItemBySlot command error: item was not found in slot", lua_interface->GetScriptName(state));
return 0;