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

Fix double messages

Browse source
This commit is contained in:
Learath 2020-07-12 10:34:36 +03:00
parent fb09f8a6c6
commit dd010364ed
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game/server/gamecontext.cpp
View file

@ -901,7 +901,7 @@ void CGameContext::OnTick()
Console()->ExecuteLine(m_aVoteCommand);
Server()->SetRconCID(IServer::RCON_CID_SERV);
EndVote();
SendChat(-1, CGameContext::CHAT_ALL, "Vote passed");
SendChat(-1, CGameContext::CHAT_ALL, "Vote passed", -1, CHAT_SIX);
if(m_apPlayers[m_VoteCreator] && !IsKickVote() && !IsSpecVote())
m_apPlayers[m_VoteCreator]->m_LastVoteCall = 0;
@ -911,7 +911,7 @@ void CGameContext::OnTick()
char aBuf[64];
str_format(aBuf, sizeof(aBuf),"Vote passed enforced by authorized player");
Console()->ExecuteLine(m_aVoteCommand, m_VoteEnforcer);
SendChat(-1, CGameContext::CHAT_ALL, aBuf);
SendChat(-1, CGameContext::CHAT_ALL, aBuf, -1, CHAT_SIX);
EndVote();
}
else if(m_VoteEnforce == VOTE_ENFORCE_NO_ADMIN)
@ -919,16 +919,16 @@ void CGameContext::OnTick()
char aBuf[64];
str_format(aBuf, sizeof(aBuf),"Vote failed enforced by authorized player");
EndVote();
SendChat(-1, CGameContext::CHAT_ALL, aBuf);
SendChat(-1, CGameContext::CHAT_ALL, aBuf, -1, CHAT_SIX);
}
//else if(m_VoteEnforce == VOTE_ENFORCE_NO || time_get() > m_VoteCloseTime)
else if(m_VoteEnforce == VOTE_ENFORCE_NO || (time_get() > m_VoteCloseTime && g_Config.m_SvVoteMajority))
{
EndVote();
if(VetoStop || (m_VoteWillPass && Veto))
SendChat(-1, CGameContext::CHAT_ALL, "Vote failed because of veto. Find an empty server instead");
SendChat(-1, CGameContext::CHAT_ALL, "Vote failed because of veto. Find an empty server instead", -1, CHAT_SIX);
else
SendChat(-1, CGameContext::CHAT_ALL, "Vote failed");
SendChat(-1, CGameContext::CHAT_ALL, "Vote failed", -1, CHAT_SIX);
}
else if(m_VoteUpdate)
{
@ -2796,7 +2796,7 @@ void CGameContext::ConForceVote(IConsole::IResult *pResult, void *pUserData)
if(str_comp_nocase(pValue, pOption->m_aDescription) == 0)
{
str_format(aBuf, sizeof(aBuf), "authroized player forced server option '%s' (%s)", pValue, pReason);
pSelf->SendChatTarget(-1, aBuf);
pSelf->SendChatTarget(-1, aBuf, CHAT_SIX);
pSelf->Console()->ExecuteLine(pOption->m_aCommand);
break;
}