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

Merge #3790

Browse source 
3790: Fix crash on test servers (fixes #3789) r=heinrich5991 a=def-

Thanks to Cøke for report

## Checklist

- [x] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2021-04-25 13:58:23 +00:00 committed by GitHub
parent c82970cf09 47b167c697
commit db52fab0ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -873,7 +873,7 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon)
return; return;
bool Locked = TeamLocked(Team) && Weapon != WEAPON_GAME; bool Locked = TeamLocked(Team) && Weapon != WEAPON_GAME;
if(g_Config.m_SvTeam == 3) if(g_Config.m_SvTeam == 3 && Team != TEAM_SUPER)
{ {
ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN); ChangeTeamState(Team, CGameTeams::TEAMSTATE_OPEN);
ResetRoundState(Team); ResetRoundState(Team);