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

fix join command queue bug

Browse Source
This commit is contained in:
Martin Michelsen
2023-11-15 13:33:34 -08:00
parent 6e1691d023
commit 533ee04443
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveSubcommands.cc
+3 -3
View File
@@ -136,7 +136,7 @@ template <typename CmdT>
static void send_or_enqueue_joining_player_command(shared_ptr<Client> c, uint8_t command, uint8_t flag, const CmdT& data) { static void send_or_enqueue_joining_player_command(shared_ptr<Client> c, uint8_t command, uint8_t flag, const CmdT& data) {
if (c->game_join_command_queue) { if (c->game_join_command_queue) {
c->log.info("Client not ready to receive join commands; adding to queue"); c->log.info("Client not ready to receive join commands; adding to queue");
auto cmd = c->game_join_command_queue->emplace_back(); auto& cmd = c->game_join_command_queue->emplace_back();
cmd.command = command; cmd.command = command;
cmd.flag = flag; cmd.flag = flag;
cmd.data.assign(reinterpret_cast<const char*>(&data), sizeof(data)); cmd.data.assign(reinterpret_cast<const char*>(&data), sizeof(data));
@@ -148,7 +148,7 @@ static void send_or_enqueue_joining_player_command(shared_ptr<Client> c, uint8_t
static void send_or_enqueue_joining_player_command(shared_ptr<Client> c, uint8_t command, uint8_t flag, string&& data) { static void send_or_enqueue_joining_player_command(shared_ptr<Client> c, uint8_t command, uint8_t flag, string&& data) {
if (c->game_join_command_queue) { if (c->game_join_command_queue) {
c->log.info("Client not ready to receive join commands; adding to queue"); c->log.info("Client not ready to receive join commands; adding to queue");
auto cmd = c->game_join_command_queue->emplace_back(); auto& cmd = c->game_join_command_queue->emplace_back();
cmd.command = command; cmd.command = command;
cmd.flag = flag; cmd.flag = flag;
cmd.data = std::move(data); cmd.data = std::move(data);
@@ -160,7 +160,7 @@ static void send_or_enqueue_joining_player_command(shared_ptr<Client> c, uint8_t
static void send_or_enqueue_joining_player_command(shared_ptr<Client> c, uint8_t command, uint8_t flag, const void* data, size_t size) { static void send_or_enqueue_joining_player_command(shared_ptr<Client> c, uint8_t command, uint8_t flag, const void* data, size_t size) {
if (c->game_join_command_queue) { if (c->game_join_command_queue) {
c->log.info("Client not ready to receive join commands; adding to queue"); c->log.info("Client not ready to receive join commands; adding to queue");
auto cmd = c->game_join_command_queue->emplace_back(); auto& cmd = c->game_join_command_queue->emplace_back();
cmd.command = command; cmd.command = command;
cmd.flag = flag; cmd.flag = flag;
cmd.data.assign(reinterpret_cast<const char*>(data), size); cmd.data.assign(reinterpret_cast<const char*>(data), size);