Skip to content

Fix position desync with dead players (#928) #4453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix position desync with dead players (#928) #4453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/CNetAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ void CNetAPI::DoPulse()

// Grab the local player
CClientPlayer* pPlayer = m_pPlayerManager->GetLocalPlayer();
if (pPlayer && !pPlayer->IsDeadOnNetwork())
if (pPlayer)
{
unsigned long ulCurrentTime = CClientTime::GetTime();

Expand Down
4 changes: 2 additions & 2 deletions Server/mods/deathmatch/logic/packets/CPlayerPuresyncPacket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ bool CPlayerPuresyncPacket::Read(NetBitStreamInterface& BitStream)
return false;

// Only read this packet if it matches the current time context that
// player is in.
if (!pSourcePlayer->CanUpdateSync(ucTimeContext))
// player is in. Allow position updates for dead players
if (!pSourcePlayer->CanUpdateSync(ucTimeContext) && !pSourcePlayer->IsDead())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think dead players can be synchronized if the time context doesn't match

{
return false;
}
Expand Down