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

Merge pull request #7314 from furo321/keep-practice

Browse source 
Don't disable practice on death.
This commit is contained in:
Dennis Felsing 2023-10-07 21:28:28 +00:00 committed by GitHub
parent a91374b276 d4ec8cf8b4
commit 7034ca84ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1047,8 +1047,22 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO && Team != TEAM_SUPER) if(g_Config.m_SvTeam == SV_TEAM_FORCED_SOLO && Team != TEAM_SUPER)
{ {
ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN); ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
if(m_aPractice[Team])
{
if(Weapon == WEAPON_SELF)
{
ResetRoundState(Team); ResetRoundState(Team);
} }
else
{
GameServer()->SendChatTeam(Team, "You died, but will stay in practice until you use kill.");
}
}
else
{
ResetRoundState(Team);
}
}
else if(Locked) else if(Locked)
{ {
SetForceCharacterTeam(ClientID, Team); SetForceCharacterTeam(ClientID, Team);