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

Merge pull request #7232 from furo321/initial-chat-delay-message

Browse source 
Use a different message when muted by sv_chat_initial_delay
This commit is contained in:
Dennis Felsing 2023-09-22 11:06:56 +00:00 committed by GitHub
parent 8009e8654d 5793891d91
commit cc2bdbd0ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1555,8 +1555,11 @@ void CGameContext::OnClientEnter(int ClientID)
// initial chat delay
if(g_Config.m_SvChatInitialDelay != 0 && m_apPlayers[ClientID]->m_JoinTick > m_NonEmptySince + 10 * Server()->TickSpeed())
{
char aBuf[128];
NETADDR Addr;
Server()->GetClientAddr(ClientID, &Addr);
str_format(aBuf, sizeof aBuf, "This server has an initial chat delay, you will need to wait %d seconds before talking.", g_Config.m_SvChatInitialDelay);
SendChatTarget(ClientID, aBuf);
Mute(&Addr, g_Config.m_SvChatInitialDelay, Server()->ClientName(ClientID), "Initial chat delay", true);
}
@ -4151,20 +4154,27 @@ bool CGameContext::ProcessSpamProtection(int ClientID, bool RespectChatInitialDe
NETADDR Addr;
Server()->GetClientAddr(ClientID, &Addr);
int Muted = 0;
for(int i = 0; i < m_NumMutes && Muted <= 0; i++)
CMute Muted;
int Expires = 0;
for(int i = 0; i < m_NumMutes && Expires <= 0; i++)
{
if(!net_addr_comp_noport(&Addr, &m_aMutes[i].m_Addr))
{
if(RespectChatInitialDelay || m_aMutes[i].m_InitialChatDelay)
Muted = (m_aMutes[i].m_Expire - Server()->Tick()) / Server()->TickSpeed();
{
Muted = m_aMutes[i];
Expires = (m_aMutes[i].m_Expire - Server()->Tick()) / Server()->TickSpeed();
}
}
}
if(Muted > 0)
if(Expires > 0)
{
char aBuf[128];
str_format(aBuf, sizeof aBuf, "You are not permitted to talk for the next %d seconds.", Muted);
if(Muted.m_InitialChatDelay)
str_format(aBuf, sizeof aBuf, "This server has an initial chat delay, you will be able to talk in %d seconds.", Expires);
else
str_format(aBuf, sizeof aBuf, "You are not permitted to talk for the next %d seconds.", Expires);
SendChatTarget(ClientID, aBuf);
return true;
}