From 79d979515fcc3b630e28bfdb31256251a4fc3745 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Sat, 29 Aug 2020 06:22:18 +0200
Subject: [PATCH] CBaseMonster & CBaseNPC: Fix angles not being set accordingly
 when not following a sequence or a player

---
 src/gs-entbase/server/basemonster.cpp | 2 ++
 src/gs-entbase/server/basenpc.cpp     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gs-entbase/server/basemonster.cpp b/src/gs-entbase/server/basemonster.cpp
index c6e351ba..d8a1c404 100644
--- a/src/gs-entbase/server/basemonster.cpp
+++ b/src/gs-entbase/server/basemonster.cpp
@@ -451,6 +451,8 @@ CBaseMonster::WalkRoute(void)
 		endangles = vectoangles(m_eEnemy.origin - origin);
 		input_movevalues = [140, 0, 0];
 		m_vecTurnAngle[1] = endangles[1];
+	} else {
+		return;
 	}
 
 	/* functional */
diff --git a/src/gs-entbase/server/basenpc.cpp b/src/gs-entbase/server/basenpc.cpp
index 55421334..2cd16763 100644
--- a/src/gs-entbase/server/basenpc.cpp
+++ b/src/gs-entbase/server/basenpc.cpp
@@ -458,7 +458,7 @@ CBaseNPC::Physics(void)
 
 			if (m_eFollowing != world) {
 				FollowPlayer();
-				input_angles = v_angle;
+				input_angles = angles = v_angle;
 			} else if (m_iFlags & MONSTER_FEAR) {
 				PanicFrame();
 			} else {