From 690296605f9423000024d439025811c47464f0a6 Mon Sep 17 00:00:00 2001
From: s1lent <s1lentsk@yandex.ru>
Date: Fri, 15 Dec 2017 00:54:56 +0700
Subject: [PATCH] Revert: sv_force_ent_intersection

---
 rehlds/engine/sv_phys.cpp |  8 +-------
 rehlds/engine/world.cpp   | 11 +++++++++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/rehlds/engine/sv_phys.cpp b/rehlds/engine/sv_phys.cpp
index 7a69012..1f35081 100644
--- a/rehlds/engine/sv_phys.cpp
+++ b/rehlds/engine/sv_phys.cpp
@@ -434,13 +434,7 @@ trace_t SV_PushEntity(edict_t *ent, vec_t *push)
 
 	if (trace.fraction != 0.0f)
 	{
-#ifdef REHLDS_FIXES
-		// don't move in the direction, since this is a dead end
-		if (!trace.startsolid && !trace.allsolid)
-#endif
-		{
-			VectorCopy(trace.endpos, ent->v.origin);
-		}
+		VectorCopy(trace.endpos, ent->v.origin);
 	}
 
 	SV_LinkEdict(ent, TRUE);
diff --git a/rehlds/engine/world.cpp b/rehlds/engine/world.cpp
index 198de77..74ccc33 100644
--- a/rehlds/engine/world.cpp
+++ b/rehlds/engine/world.cpp
@@ -1221,8 +1221,15 @@ void SV_ClipToLinks(areanode_t *node, moveclip_t *clip)
 		|| clip->boxmaxs[2] < touch->v.absmin[2])
 			continue;
 
-		if (touch->v.solid != SOLID_SLIDEBOX && !SV_CheckSphereIntersection(touch, clip->start, clip->end))
-			continue;
+		if (touch->v.solid != SOLID_SLIDEBOX
+#ifdef REHLDS_FIXES
+			|| sv_force_ent_intersection.value
+#endif
+)
+		{
+			if (!SV_CheckSphereIntersection(touch, clip->start, clip->end))
+				continue;
+		}
 
 		if (clip->passedict && clip->passedict->v.size[0] && !touch->v.size[0])
 			continue; // points never interact