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

fix duplicate pick up disconnections on BB

Browse Source
This commit is contained in:
Martin Michelsen
2023-11-15 17:29:09 -08:00
parent 6aef245eab
commit c896c11f57
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveSubcommands.cc
+9 -14
View File
@@ -1114,13 +1114,14 @@ static void on_pick_up_item_request(shared_ptr<Client> c, uint8_t command, uint8
return; return;
} }
bool item_tracking_enabled = l->check_flag(Lobby::Flag::ITEM_TRACKING_ENABLED);
if (item_tracking_enabled && !l->item_exists(cmd.item_id)) {
l->log.warning("Player %hu requests to pick up %08" PRIX32 ", but the item does not exist; dropping command",
cmd.header.client_id.load(), cmd.item_id.load());
} else if (l->base_version == GameVersion::BB) {
// This is handled by the server on BB, and by the leader on other versions. // This is handled by the server on BB, and by the leader on other versions.
// However, there appears to be a bug in v2 that causes the leader to if (!item_tracking_enabled) {
// sometimes allow players to pick up items that someone else has already
// picked up. To account for this, we discard requests to pick up items that
// don't exist instead of disconnecting the client.
if (l->base_version == GameVersion::BB) {
if (!l->check_flag(Lobby::Flag::ITEM_TRACKING_ENABLED)) {
throw logic_error("item tracking not enabled in BB game"); throw logic_error("item tracking not enabled in BB game");
} }
@@ -1130,21 +1131,15 @@ static void on_pick_up_item_request(shared_ptr<Client> c, uint8_t command, uint8
auto s = c->require_server_state(); auto s = c->require_server_state();
auto name = s->describe_item(c->version(), item, false); auto name = s->describe_item(c->version(), item, false);
l->log.info("Player %hu picked up (BB) %08" PRIX32 " (%s)", l->log.info("Player %hu picked up (BB) %08" PRIX32 " (%s)", cmd.header.client_id.load(), cmd.item_id.load(), name.c_str());
cmd.header.client_id.load(), cmd.item_id.load(), name.c_str());
if (c->config.check_flag(Client::Flag::DEBUG_ENABLED)) { if (c->config.check_flag(Client::Flag::DEBUG_ENABLED)) {
auto name = s->describe_item(c->version(), item, true); auto name = s->describe_item(c->version(), item, true);
send_text_message_printf(c, "$C5PICK/BB %08" PRIX32 "\n%s", send_text_message_printf(c, "$C5PICK/BB %08" PRIX32 "\n%s", cmd.item_id.load(), name.c_str());
cmd.item_id.load(), name.c_str());
} }
p->print_inventory(stderr, c->version(), s->item_name_index); p->print_inventory(stderr, c->version(), s->item_name_index);
send_pick_up_item(c, cmd.item_id, cmd.floor); send_pick_up_item(c, cmd.item_id, cmd.floor);
} else if (l->check_flag(Lobby::Flag::ITEM_TRACKING_ENABLED) && !l->item_exists(cmd.item_id)) {
l->log.warning("Player %hu requests to pick up %08" PRIX32 ", but the item does not exist; dropping command",
cmd.header.client_id.load(), cmd.item_id.load());
} else { } else {
forward_subcommand(c, command, flag, data, size); forward_subcommand(c, command, flag, data, size);
} }