incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ignore client's equip slot if item can't be equipped in it

Browse Source
This commit is contained in:
Martin Michelsen
2024-02-28 19:52:15 -08:00
parent 90152b4138
commit 424f191bc6
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PlayerSubordinates.cc
+1 -4
View File
@@ -576,13 +576,10 @@ void PlayerInventory::equip_item_id(uint32_t item_id, EquipSlot slot, bool allow
void PlayerInventory::equip_item_index(size_t index, EquipSlot slot, bool allow_overwrite) { void PlayerInventory::equip_item_index(size_t index, EquipSlot slot, bool allow_overwrite) {
auto& item = this->items[index]; auto& item = this->items[index];
if (slot == EquipSlot::UNKNOWN) { if ((slot == EquipSlot::UNKNOWN) || !item.data.can_be_equipped_in_slot(slot)) {
slot = item.data.default_equip_slot(); slot = item.data.default_equip_slot();
} }
if (!item.data.can_be_equipped_in_slot(slot)) {
throw runtime_error("incorrect item type for equip slot");
}
if (this->has_equipped_item(slot)) { if (this->has_equipped_item(slot)) {
if (allow_overwrite) { if (allow_overwrite) {
this->unequip_item_slot(slot); this->unequip_item_slot(slot);