From dd010364edd113e36928cafecb9d4d6c1db8ed86 Mon Sep 17 00:00:00 2001 From: Learath Date: Sun, 12 Jul 2020 10:34:36 +0300 Subject: [PATCH] Fix double messages --- src/game/server/gamecontext.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp index d05223f9b..9c108ef7a 100644 --- a/src/game/server/gamecontext.cpp +++ b/src/game/server/gamecontext.cpp @@ -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; }