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 #2350

Browse source 
2350: Name change hack for 0.7. Close #2330 r=heinrich5991 a=Learath2

This felt a little verbose, but I couldn't really come up with any better. Maybe someone more crafty can figure out a cleaner way.

Co-authored-by: Learath <learath2@gmail.com>
This commit is contained in:
bors[bot] 2020-06-24 15:18:47 +00:00 committed by GitHub
parent 09f60fc919 b6fb304508
commit 69808f829e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2046,6 +2046,8 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
if(g_Config.m_SvSpamprotection && pPlayer->m_LastChangeInfo && pPlayer->m_LastChangeInfo+Server()->TickSpeed()*g_Config.m_SvInfoChangeDelay > Server()->Tick())
return;
bool SixupNeedsUpdate = false;
CNetMsg_Cl_ChangeInfo *pMsg = (CNetMsg_Cl_ChangeInfo *)pRawMsg;
if(!str_utf8_check(pMsg->m_pName)
|| !str_utf8_check(pMsg->m_pClan)
@ -2066,13 +2068,21 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
SendChat(-1, CGameContext::CHAT_ALL, aChatText);
// reload scores
Score()->PlayerData(ClientID)->Reset();
m_apPlayers[ClientID]->m_Score = -9999;
Score()->LoadPlayerData(ClientID);
SixupNeedsUpdate = true;
}
if(str_comp(Server()->ClientClan(ClientID), pMsg->m_pClan))
SixupNeedsUpdate = true;
Server()->SetClientClan(ClientID, pMsg->m_pClan);
if(Server()->ClientCountry(ClientID) != pMsg->m_Country)
SixupNeedsUpdate = true;
Server()->SetClientCountry(ClientID, pMsg->m_Country);
str_copy(pPlayer->m_TeeInfos.m_SkinName, pMsg->m_pSkin, sizeof(pPlayer->m_TeeInfos.m_SkinName));
pPlayer->m_TeeInfos.m_UseCustomColor = pMsg->m_UseCustomColor;
pPlayer->m_TeeInfos.m_ColorBody = pMsg->m_ColorBody;
@ -2080,16 +2090,52 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
if(!Server()->IsSixup(ClientID))
pPlayer->m_TeeInfos.ToSixup();
protocol7::CNetMsg_Sv_SkinChange SkinChangeMsg;
SkinChangeMsg.m_ClientID = ClientID;
for(int p = 0; p < 6; p++)
if(SixupNeedsUpdate)
{
SkinChangeMsg.m_apSkinPartNames[p] = pPlayer->m_TeeInfos.m_apSkinPartNames[p];
SkinChangeMsg.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p];
SkinChangeMsg.m_aUseCustomColors[p] = pPlayer->m_TeeInfos.m_aUseCustomColors[p];
protocol7::CNetMsg_Sv_ClientDrop Drop;
Drop.m_ClientID = ClientID;
Drop.m_pReason = "";
Drop.m_Silent = true;
protocol7::CNetMsg_Sv_ClientInfo Info;
Info.m_ClientID = ClientID;
Info.m_pName = Server()->ClientName(ClientID);
Info.m_Country = pMsg->m_Country;
Info.m_pClan = pMsg->m_pClan;
Info.m_Local = 0;
Info.m_Silent = true;
Info.m_Team = pPlayer->GetTeam();
for(int p = 0; p < 6; p++)
{
Info.m_apSkinPartNames[p] = pPlayer->m_TeeInfos.m_apSkinPartNames[p];
Info.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p];
Info.m_aUseCustomColors[p] = pPlayer->m_TeeInfos.m_aUseCustomColors[p];
}
for(int i = 0; i < MAX_CLIENTS; i++)
{
if(i != ClientID)
{
Server()->SendPackMsg(&Drop, MSGFLAG_VITAL|MSGFLAG_NORECORD, i);
Server()->SendPackMsg(&Info, MSGFLAG_VITAL|MSGFLAG_NORECORD, i);
}
}
}
else
{
protocol7::CNetMsg_Sv_SkinChange Msg;
Msg.m_ClientID = ClientID;
for(int p = 0; p < 6; p++)
{
Msg.m_apSkinPartNames[p] = pPlayer->m_TeeInfos.m_apSkinPartNames[p];
Msg.m_aSkinPartColors[p] = pPlayer->m_TeeInfos.m_aSkinPartColors[p];
Msg.m_aUseCustomColors[p] = pPlayer->m_TeeInfos.m_aUseCustomColors[p];
}
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL|MSGFLAG_NORECORD, -1);
}
Server()->SendPackMsg(&SkinChangeMsg, MSGFLAG_VITAL|MSGFLAG_NORECORD, -1);
Server()->ExpireServerInfo();
}
else if (MsgID == NETMSGTYPE_CL_EMOTICON && !m_World.m_Paused)