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

Kick-voting someone from team doesn't kill locked team (fixes #3207)

Browse source
This commit is contained in:
def 2020-10-31 11:32:37 +01:00
parent b832811ae9
commit 2c98f2b76b
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/ddracecommands.cpp
View file

@ -665,7 +665,7 @@ void CGameContext::ConSetDDRTeam(IConsole::IResult *pResult, void *pUserData)
CCharacter *pChr = pSelf->GetPlayerChar(Target); CCharacter *pChr = pSelf->GetPlayerChar(Target);
if((pController->m_Teams.m_Core.Team(Target) && pController->m_Teams.GetDDRaceState(pSelf->m_apPlayers[Target]) == DDRACE_STARTED) || (pChr && pController->m_Teams.IsPractice(pChr->Team()))) if((pController->m_Teams.m_Core.Team(Target) && pController->m_Teams.GetDDRaceState(pSelf->m_apPlayers[Target]) == DDRACE_STARTED) || (pChr && pController->m_Teams.IsPractice(pChr->Team())))
pSelf->m_apPlayers[Target]->KillCharacter(WEAPON_SELF); pSelf->m_apPlayers[Target]->KillCharacter(WEAPON_GAME);
pController->m_Teams.SetForceCharacterTeam(Target, Team); pController->m_Teams.SetForceCharacterTeam(Target, Team);
} }