diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h index cf9de7b2f..84a4a15b4 100644 --- a/src/game/server/gamecontext.h +++ b/src/game/server/gamecontext.h @@ -442,7 +442,6 @@ private: static void ConUnlock(IConsole::IResult *pResult, void *pUserData); static void ConInvite(IConsole::IResult *pResult, void *pUserData); static void ConJoin(IConsole::IResult *pResult, void *pUserData); - static void ConAccept(IConsole::IResult *pResult, void *pUserData); static void ConMe(IConsole::IResult *pResult, void *pUserData); static void ConWhisper(IConsole::IResult *pResult, void *pUserData); static void ConConverse(IConsole::IResult *pResult, void *pUserData); diff --git a/src/game/server/teams.cpp b/src/game/server/teams.cpp index 4c01fc084..da738b0d1 100644 --- a/src/game/server/teams.cpp +++ b/src/game/server/teams.cpp @@ -372,7 +372,7 @@ const char *CGameTeams::SetCharacterTeam(int ClientID, int Team) return "Invalid client ID"; if(Team < 0 || Team >= MAX_CLIENTS + 1) return "Invalid team number"; - if(Team != TEAM_SUPER && m_aTeamState[Team] > TEAMSTATE_OPEN) + if(Team != TEAM_SUPER && m_aTeamState[Team] > TEAMSTATE_OPEN && !m_aPractice[Team]) return "This team started already"; if(m_Core.Team(ClientID) == Team) return "You are in this team already"; @@ -1102,7 +1102,7 @@ void CGameTeams::OnCharacterDeath(int ClientID, int Weapon) } else { - if(m_aTeamState[m_Core.Team(ClientID)] == CGameTeams::TEAMSTATE_STARTED && !m_aTeeStarted[ClientID]) + if(m_aTeamState[m_Core.Team(ClientID)] == CGameTeams::TEAMSTATE_STARTED && !m_aTeeStarted[ClientID] && !m_aPractice[Team]) { char aBuf[128]; str_format(aBuf, sizeof(aBuf), "This team cannot finish anymore because '%s' left the team before hitting the start", Server()->ClientName(ClientID));