From 7bfd7084058f49ba1db3df9015bbec680cbc144c Mon Sep 17 00:00:00 2001 From: trml Date: Wed, 25 Nov 2020 23:38:06 +0100 Subject: [PATCH] Set ddnetchar flags when collision is disabled with server tunings --- src/game/server/entities/character.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 6db743f07..32bf156d5 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -1251,9 +1251,9 @@ void CCharacter::Snap(int SnappingClient) pDDNetCharacter->m_Flags |= CHARACTERFLAG_SUPER; if(m_EndlessHook) pDDNetCharacter->m_Flags |= CHARACTERFLAG_ENDLESS_HOOK; - if(!m_Core.m_Collision) + if(!m_Core.m_Collision || !GameServer()->Tuning()->m_PlayerCollision) pDDNetCharacter->m_Flags |= CHARACTERFLAG_NO_COLLISION; - if(!m_Core.m_Hook) + if(!m_Core.m_Hook || !GameServer()->Tuning()->m_PlayerHooking) pDDNetCharacter->m_Flags |= CHARACTERFLAG_NO_HOOK; if(m_SuperJump) pDDNetCharacter->m_Flags |= CHARACTERFLAG_ENDLESS_JUMP;