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

Merge pull request #7743 from furo321/hookduration-07

Browse source 
Fix players on 0.7 becoming invisible when `m_HookTick` is negative.
This commit is contained in:
Dennis Felsing 2023-12-29 22:58:38 +00:00 committed by GitHub
parent 5873b42b57 a918c61de8
commit 9c8a081692
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1099,6 +1099,10 @@ void CCharacter::SnapCharacter(int SnappingClient, int ID)
pCharacter->m_Angle -= (int)(2.0f * pi * 256.0f); pCharacter->m_Angle -= (int)(2.0f * pi * 256.0f);
} }
// m_HookTick can be negative when using the hook_duration tune, which 0.7 clients
// will consider invalid. https://github.com/ddnet/ddnet/issues/3915
pCharacter->m_HookTick = maximum(0, pCharacter->m_HookTick);
pCharacter->m_Tick = Tick; pCharacter->m_Tick = Tick;
pCharacter->m_Emote = Emote; pCharacter->m_Emote = Emote;
pCharacter->m_AttackTick = m_AttackTick; pCharacter->m_AttackTick = m_AttackTick;