edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

do not release the hooks if you swap

Browse source
This commit is contained in:
c0d3d3v 2022-04-30 10:21:38 +02:00
parent 2e12082938
commit 0ea811f70e
No known key found for this signature in database
GPG key ID: 068AF680530DFF31
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/server/entities/character.cpp
View file

@ -2367,3 +2367,8 @@ int64_t CCharacter::TeamMask()
{
return Teams()->TeamMask(Team(), -1, GetPlayer()->GetCID());
}
void CCharacter::SwapClients(int Client1, int Client2)
{
m_Core.m_HookedPlayer = m_Core.m_HookedPlayer == Client1 ? Client2 : m_Core.m_HookedPlayer == Client2 ? Client1 : m_Core.m_HookedPlayer;
}

1
src/game/server/entities/character.h
View file

@ -40,6 +40,7 @@ public:
virtual void TickDefered();
virtual void TickPaused();
virtual void Snap(int SnappingClient);
virtual void SwapClients(int Client1, int Client2) override;
bool CanSnapCharacter(int SnappingClient);

8
src/game/server/teams.cpp
View file

@ -872,14 +872,6 @@ void CGameTeams::SwapTeamCharacters(CPlayer *pPlayer, CPlayer *pTargetPlayer, in
return;
}
for(int i = 0; i < MAX_CLIENTS; i++)
{
if(m_Core.Team(i) == Team && GameServer()->m_apPlayers[i])
{
GameServer()->m_apPlayers[i]->GetCharacter()->ResetHook();
GameServer()->m_World.ReleaseHooked(i);
}
}
CSaveTee PrimarySavedTee;
PrimarySavedTee.Save(pPlayer->GetCharacter());