Skip to content

Commit 009190e

Browse files
committed
Avoid code duplication and fix grammar when setting discord state
1 parent a174747 commit 009190e

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

Client/mods/deathmatch/logic/CPacketHandler.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -996,10 +996,15 @@ void CPacketHandler::Packet_PlayerList(NetBitStreamInterface& bitStream)
996996
CLuaArguments Arguments;
997997
pPlayer->CallEvent("onClientPlayerJoin", Arguments, true);
998998

999+
// Set discord state to players[/slot] count
1000+
uint playerCount = g_pClientGame->GetPlayerManager()->Count();
1001+
SString state(std::to_string(playerCount));
1002+
9991003
if (g_pCore->GetNetwork()->GetServerBitStreamVersion() >= 0x06D)
1000-
g_pCore->GetDiscordManager()->SetState(SString("%i/%i Players", g_pClientGame->GetPlayerManager()->Count(), g_pClientGame->GetServerInfo()->GetMaxPlayers()), [](EDiscordRes) {});
1001-
else
1002-
g_pCore->GetDiscordManager()->SetState(SString("%i Players", g_pClientGame->GetPlayerManager()->Count()), [](EDiscordRes) {});
1004+
state += "/" + std::to_string(g_pClientGame->GetServerInfo()->GetMaxPlayers());
1005+
1006+
state += (playerCount == 1 ? " Player" : " Players");
1007+
g_pCore->GetDiscordManager()->SetState(state, [](EDiscordRes) {});
10031008
}
10041009
}
10051010
}

0 commit comments

Comments
 (0)