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

Merge #2028

Browse source 
2028: Simplify anti stuck code more r=def- a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
This commit is contained in:
bors[bot] 2020-01-05 14:53:47 +00:00 committed by GitHub
parent 19779ccf94 f5b8bbc2ff
commit 77957c00b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/gamecore.cpp
View file

@ -494,7 +494,7 @@ void CCharacterCore::Move()
if((!(pCharCore->m_Super || m_Super) && (m_Solo || pCharCore->m_Solo || !pCharCore->m_Collision || pCharCore->m_NoCollision || (m_Id != -1 && !m_pTeams->CanCollide(m_Id, p)))))
continue;
float D = distance(Pos, pCharCore->m_Pos);
if((D < 28.0f && D > 0.0f) || (D <= 0.001f && D >= 0.f))
if(D < 28.0f && D >= 0.0f)
{
if(a > 0.0f)
m_Pos = LastPos;