From 8765379a2e7a608ffae0fb07b2fac2e3978f819a Mon Sep 17 00:00:00 2001 From: Kai Philipp Date: Mon, 9 Sep 2019 21:13:40 +0200 Subject: [PATCH] if else clause turn-around --- src/net/common/serverlobbythread.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index 4126f28c..d76b796d 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -1427,17 +1427,15 @@ ServerLobbyThread::HandleNetPacketJoinGame(boost::shared_ptr sessio SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_NOT_INVITED); } else if (!game->CheckPassword(password)) { SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_INVALID_PASSWORD); - } else if (tmpData.gameType == GAME_TYPE_RANKING) { - if(!joinGame.spectateonly() - // && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR - // && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR_V4V6 - // && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR_V4 - // && game->IsClientAddressConnected(session->GetClientAddr())) { - ){ - SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_IP_BLOCKED); - }else if (!session->IsPlayerAllowedToJoinLimitRank()) { - SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_GAME_INVALID); - } + } else if (tmpData.gameType == GAME_TYPE_RANKING && !session->IsPlayerAllowedToJoinLimitRank()) { + SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_GUEST_FORBIDDEN); + } else if (tmpData.gameType == GAME_TYPE_RANKING && !joinGame.spectateonly() + // && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR + // && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR_V4V6 + // && session->GetClientAddr() != SERVER_ADDRESS_LOCALHOST_STR_V4 + // && game->IsClientAddressConnected(session->GetClientAddr())) { + ){ + SendJoinGameFailed(session, joinGame.gameid(), NTF_NET_JOIN_IP_BLOCKED); } else { MoveSessionToGame(game, session, joinGame.autoleave(), false); }