From 2d85358e7e55f153e5ef069ca98f3fda2938bde8 Mon Sep 17 00:00:00 2001
From: s1lent <s1lentsk@yandex.ru>
Date: Fri, 15 Dec 2017 00:28:05 +0700
Subject: [PATCH] SV_FlyMove: fixed illogical checks

---
 rehlds/engine/sv_phys.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rehlds/engine/sv_phys.cpp b/rehlds/engine/sv_phys.cpp
index 74a21f5..7a69012 100644
--- a/rehlds/engine/sv_phys.cpp
+++ b/rehlds/engine/sv_phys.cpp
@@ -265,7 +265,12 @@ void SV_FlyMove(edict_t *ent, float time)
 			if (trace.ent->v.solid == SOLID_BSP
 				|| trace.ent->v.solid == SOLID_SLIDEBOX
 				|| trace.ent->v.movetype == MOVETYPE_PUSHSTEP
-				|| (ent->v.flags & FL_CLIENT) == FL_CLIENT)
+				|| (
+#ifdef REHLDS_FIXES
+					// Should be a case when entity collided into the client that has non-standard SOLID_BBOX set
+					trace.
+#endif
+					ent->v.flags & FL_CLIENT) == FL_CLIENT)
 			{
 				ent->v.flags |= FL_ONGROUND;
 				ent->v.groundentity = trace.ent;