From: terencehill <piuntn@gmail.com>
Date: Sat, 23 Jun 2018 20:25:48 +0000 (+0200)
Subject: Bot AI: fix tracewalk failing to reach a player when it starts from above them
X-Git-Tag: xonotic-v0.8.5~1923^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05c70ec2bb5a677495bc190e4a045092d4b1ca39;p=xonotic%2Fxonotic-data.pk3dir.git

Bot AI: fix tracewalk failing to reach a player when it starts from above them
---

diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index d69da71a5..6ae5feba0 100644
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -126,8 +126,18 @@ void set_tracewalk_dest(entity ent, vector org, bool fix_player_dest)
 		// z coord is set to ent's min height
 		tracewalk_dest.x = bound(wm1.x, org.x, wm2.x);
 		tracewalk_dest.y = bound(wm1.y, org.y, wm2.y);
-		tracewalk_dest.z = wm1.z;
-		tracewalk_dest_height = wm2.z - wm1.z; // destination height
+		if ((IS_PLAYER(ent) || IS_MONSTER(ent))
+			&& org.x == tracewalk_dest.x && org.y == tracewalk_dest.y && org.z > tracewalk_dest.z)
+		{
+			tracewalk_dest.z = wm2.z - PL_MIN_CONST.z;
+			tracewalk_dest_height = 0;
+			fix_player_dest = false;
+		}
+		else
+		{
+			tracewalk_dest.z = wm1.z;
+			tracewalk_dest_height = wm2.z - wm1.z;
+		}
 	}
 	else
 	{