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

deal with invalid 6x59 commands

Browse Source
This commit is contained in:
Martin Michelsen
2023-11-03 23:10:07 -07:00
parent f63b4bd88b
commit a7e478780e
4 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Player.cc
+5 -4
View File
@@ -338,10 +338,11 @@ void SavedPlayerDataBB::add_item(const ItemData& item) {
// If we found an existing stack, add it to the total and return
if (y < this->inventory.num_items) {
this->inventory.items[y].data.data1[5] += item.data1[5];
if (this->inventory.items[y].data.data1[5] > combine_max) {
this->inventory.items[y].data.data1[5] = combine_max;
size_t new_stack_size = this->inventory.items[y].data.data1[5] + item.data1[5];
if (new_stack_size > combine_max) {
throw out_of_range("stack is too large");
}
this->inventory.items[y].data.data1[5] = new_stack_size;
return;
}
}
@@ -349,7 +350,7 @@ void SavedPlayerDataBB::add_item(const ItemData& item) {
// If we get here, then it's not meseta and not a combine item, so it needs to
// go into an empty inventory slot
if (this->inventory.num_items >= 30) {
throw runtime_error("inventory is full");
throw out_of_range("inventory is full");
}
auto& inv_item = this->inventory.items[this->inventory.num_items];
inv_item.present = 1;