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

fix trade window bug on non-BB

Browse Source
This commit is contained in:
Martin Michelsen
2024-11-08 10:18:51 -08:00
parent 75be38c38b
commit a7811429a8
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveCommands.cc
+6 -3
View File
@@ -4909,8 +4909,11 @@ static void on_D2_V3_BB(shared_ptr<Client> c, uint16_t, uint32_t, string& data)
} }
auto s = c->require_server_state(); auto s = c->require_server_state();
auto complete_trade_for_side = [&](shared_ptr<Client> to_c, shared_ptr<Client> from_c) { auto complete_trade_for_side = +[](shared_ptr<Client> to_c, shared_ptr<Client> from_c) {
if (c->version() == Version::BB_V4) { auto l = to_c->require_lobby();
auto s = to_c->require_server_state();
if (to_c->version() == Version::BB_V4) {
// On BB, the server is expected to generate the delete item and create // On BB, the server is expected to generate the delete item and create
// item commands // item commands
auto to_p = to_c->character(); auto to_p = to_c->character();
@@ -4938,7 +4941,7 @@ static void on_D2_V3_BB(shared_ptr<Client> c, uint16_t, uint32_t, string& data)
} else { } else {
// On V3, the clients will handle it; we just send their final trade lists // On V3, the clients will handle it; we just send their final trade lists
// to each other // to each other
send_execute_item_trade(to_c, target_c->pending_item_trade->items); send_execute_item_trade(to_c, from_c->pending_item_trade->items);
} }
send_command(to_c, 0xD4, 0x01); send_command(to_c, 0xD4, 0x01);