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

don't allow error cases for bb_exchange_pd_percent to destroy items

Browse Source
This commit is contained in:
Martin Michelsen
2026-03-04 21:18:45 -08:00
parent e05991ffb3
commit 382bc6b7ce
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/QuestScript.cc
+1 -1
View File
@@ -2004,7 +2004,7 @@ static const QuestScriptOpcodeDefinition opcode_defs[] = {
{0xF8CB, "clear_slot_invincible", "set_slot_targetable?", {R_REG}, F_V3_V4},
// These opcodes inflict various status conditions on a player. In the case of Shifta/Deband/Jellen/Zalure, the
// effective technicuqe level is 21.
// effective technique level is 21.
// regA = client ID
{0xF8CC, "set_slot_poison", nullptr, {R_REG}, F_V3_V4},
{0xF8CD, "set_slot_paralyze", nullptr, {R_REG}, F_V3_V4},
src/ReceiveSubcommands.cc
+10 -4
View File
@@ -5377,10 +5377,8 @@ static asio::awaitable<void> on_upgrade_weapon_attribute_bb(shared_ptr<Client> c
if (payment_item.stack_size(*s->item_stack_limits(c->version())) < cmd.payment_count) {
throw runtime_error("not enough payment items present");
}
p->remove_item(payment_item.id, cmd.payment_count, *s->item_stack_limits(c->version()));
send_destroy_item_to_lobby(c, payment_item.id, cmd.payment_count);
uint8_t attribute_amount = 0;
int8_t attribute_amount = 0;
if (cmd.payment_type == 1 && cmd.payment_count == 1) {
attribute_amount = 30;
} else if (cmd.payment_type == 0 && cmd.payment_count == 4) {
@@ -5401,8 +5399,16 @@ static asio::awaitable<void> on_upgrade_weapon_attribute_bb(shared_ptr<Client> c
if (attribute_index == 0) {
throw runtime_error("no available attribute slots");
}
int8_t new_attr_value = static_cast<int8_t>(item.data1[attribute_index + 1]) + attribute_amount;
if (new_attr_value > 100) {
throw runtime_error("bonus value exceeds 100");
}
p->remove_item(payment_item.id, cmd.payment_count, *s->item_stack_limits(c->version()));
send_destroy_item_to_lobby(c, payment_item.id, cmd.payment_count);
item.data1[attribute_index] = cmd.attribute;
item.data1[attribute_index + 1] += attribute_amount;
item.data1[attribute_index + 1] += new_attr_value;
send_destroy_item_to_lobby(c, item.id, 1);
send_create_inventory_item_to_lobby(c, c->lobby_client_id, item);