fix port name in game server lookup
This commit is contained in:
@@ -4202,9 +4202,15 @@ static asio::awaitable<void> on_40(shared_ptr<Client> c, Channel::Message& msg)
|
|||||||
"Client sent incorrect source Guild Card number ({:08X}) in card search",
|
"Client sent incorrect source Guild Card number ({:08X}) in card search",
|
||||||
cmd.searcher_guild_card_number.load()));
|
cmd.searcher_guild_card_number.load()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
shared_ptr<Client> result;
|
||||||
try {
|
try {
|
||||||
auto s = c->require_server_state();
|
auto s = c->require_server_state();
|
||||||
auto result = s->find_client(nullptr, cmd.target_guild_card_number);
|
result = s->find_client(nullptr, cmd.target_guild_card_number);
|
||||||
|
} catch (const out_of_range&) {
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result) {
|
||||||
if (!result->blocked_senders.count(c->login->account->account_id)) {
|
if (!result->blocked_senders.count(c->login->account->account_id)) {
|
||||||
auto result_lobby = result->lobby.lock();
|
auto result_lobby = result->lobby.lock();
|
||||||
if (result_lobby) {
|
if (result_lobby) {
|
||||||
@@ -4219,10 +4225,11 @@ static asio::awaitable<void> on_40(shared_ptr<Client> c, Channel::Message& msg)
|
|||||||
c->log.info_f("Guild Card search ({} for {}) found {} but searcher is blocked",
|
c->log.info_f("Guild Card search ({} for {}) found {} but searcher is blocked",
|
||||||
cmd.searcher_guild_card_number.load(), cmd.target_guild_card_number.load(), result->channel->name);
|
cmd.searcher_guild_card_number.load(), cmd.target_guild_card_number.load(), result->channel->name);
|
||||||
}
|
}
|
||||||
} catch (const out_of_range&) {
|
} else {
|
||||||
c->log.info_f("Guild Card search ({} for {}) did not find any player",
|
c->log.info_f("Guild Card search ({} for {}) did not find any player",
|
||||||
cmd.searcher_guild_card_number.load(), cmd.target_guild_card_number.load());
|
cmd.searcher_guild_card_number.load(), cmd.target_guild_card_number.load());
|
||||||
}
|
}
|
||||||
|
|
||||||
co_return;
|
co_return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -320,7 +320,7 @@ uint16_t ServerState::game_server_port_for_version(Version v) const {
|
|||||||
case Version::XB_V3:
|
case Version::XB_V3:
|
||||||
return this->name_to_port_config.at("xb")->port;
|
return this->name_to_port_config.at("xb")->port;
|
||||||
case Version::BB_V4:
|
case Version::BB_V4:
|
||||||
return this->name_to_port_config.at("xb")->port;
|
return this->name_to_port_config.at("bb-data1")->port;
|
||||||
default:
|
default:
|
||||||
throw runtime_error("unknown version");
|
throw runtime_error("unknown version");
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user