pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Crash] Fix crash in add loot code path (#4745)

Browse Source
This commit is contained in:
Chris Miles 2025-03-03 00:16:51 -06:00 committed by GitHub
parent eac7a73fb6
commit 07d14c2681
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zone/loot.cpp
View File

@ -375,6 +375,10 @@ void NPC::AddLootDrop(
if (item2->Slots & slots) { if (item2->Slots & slots) {
if (equipment[i]) { if (equipment[i]) {
compitem = database.GetItem(equipment[i]); compitem = database.GetItem(equipment[i]);
if (!compitem) {
continue;
}
if (item2->AC > compitem->AC || (item2->AC == compitem->AC && item2->HP > compitem->HP)) { if (item2->AC > compitem->AC || (item2->AC == compitem->AC && item2->HP > compitem->HP)) {
// item would be an upgrade // item would be an upgrade
// check if we're multi-slot, if yes then we have to keep // check if we're multi-slot, if yes then we have to keep
@ -385,6 +389,9 @@ void NPC::AddLootDrop(
else { else {
// Unequip old item // Unequip old item
auto *old_item = GetItem(i); auto *old_item = GetItem(i);
if (!old_item) {
continue;
}
old_item->equip_slot = EQ::invslot::SLOT_INVALID; old_item->equip_slot = EQ::invslot::SLOT_INVALID;
@ -677,7 +684,7 @@ LootItem *NPC::GetItem(int slot_id)
end = m_loot_items.end(); end = m_loot_items.end();
for (; cur != end; ++cur) { for (; cur != end; ++cur) {
LootItem *item = *cur; LootItem *item = *cur;
if (item->equip_slot == slot_id) { if (item && item->equip_slot == slot_id) {
return item; return item;
} }
} }