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

Further tests and edge cases dealt with

Browse source
This commit is contained in:
Kyle Bradley 2021-03-17 21:23:41 +02:00
parent 2d4834ffcf
commit a68b28fc14
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -311,7 +311,10 @@ void CGameTeams::SetForceCharacterTeam(int ClientID, int Team)
SendTeamsState(LoopClientID); SendTeamsState(LoopClientID);
if(GetPlayer(ClientID)) if(GetPlayer(ClientID))
{
GetPlayer(ClientID)->m_VotedForPractice = false; GetPlayer(ClientID)->m_VotedForPractice = false;
GetPlayer(ClientID)->m_ClientSwapID = -1;
}
} }
if(Team != TEAM_SUPER && (m_TeamState[Team] == TEAMSTATE_EMPTY || m_TeamLocked[Team])) if(Team != TEAM_SUPER && (m_TeamState[Team] == TEAMSTATE_EMPTY || m_TeamLocked[Team]))
@ -721,7 +724,8 @@ void CGameTeams::SwapTeamCharacters(CPlayer *Player, CPlayer *TargetPlayer, int
return; return;
} }
if(Since > g_Config.m_SvSwapTimeout) int TimeoutAfterDelay = g_Config.m_SvSaveGamesDelay + g_Config.m_SvSwapTimeout;
if(Since > TimeoutAfterDelay)
{ {
str_format(aBuf, sizeof(aBuf), str_format(aBuf, sizeof(aBuf),
"Your swap request timed out %d seconds ago.", "Your swap request timed out %d seconds ago.",