edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 06:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
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
parent f7d23844db 703db2c124
commit 1130ebc3b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/server/teams.cpp
View file

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