0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove doubled checks for game membership

Browse source 
If the player is a part of the game, their ptr is valid, so the is_member call is useless.
This commit is contained in:
kabachuha 2020-12-04 15:43:41 +03:00 • committed by Gunter Labes
parent af579c6bf1
commit f84cfde76f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/server/wesnothd/server.cpp
View file

@ -1124,7 +1124,7 @@ void server::handle_whisper(socket_ptr socket, simple_wml::node& whisper)
}
auto g = player_connections_.find(socket)->get_game();
if(g && g->started() && g->is_player(receiver_iter->socket()) && g->is_member(socket)) {
if(g && g->started() && g->is_player(receiver_iter->socket())) {
send_server_message(socket, "You cannot send private messages to players in a running game you observe.", "error");
return;
}
@ -2170,7 +2170,7 @@ void server::roll_handler(const std::string& issuer_name,
}
auto g_ptr = player_ptr->get_game();
if(g_ptr && g_ptr->is_member(player_ptr->socket())) {
if(g_ptr) {
g_ptr->send_server_message_to_all(issuer_name + " rolled a die [1 - " + parameters + "] and got a " + value + ".", player_ptr->socket());
} else {
*out << " (The result is shown to others only in a game.)";