Merge pull request #7324 from furo321/solo-kill-team

Don't announce team killed if it's a solo server.
This commit is contained in:
Dennis Felsing 2023-10-08 11:38:26 +00:00 committed by GitHub
commit 1130ebc3b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1125,7 +1125,14 @@ void CGameTeams::SetClientInvited(int Team, int ClientID, bool Invited)
void CGameTeams::KillSavedTeam(int ClientID, int Team) void CGameTeams::KillSavedTeam(int ClientID, int Team)
{ {
if(g_Config.m_SvSoloServer || !g_Config.m_SvTeam)
{
GameServer()->m_apPlayers[ClientID]->KillCharacter(WEAPON_SELF, true);
}
else
{
KillTeam(Team, -1); KillTeam(Team, -1);
}
} }
void CGameTeams::ResetSavedTeam(int ClientID, int Team) void CGameTeams::ResetSavedTeam(int ClientID, int Team)