From: terencehill <piuntn@gmail.com>
Date: Tue, 17 Jul 2018 14:00:22 +0000 (+0200)
Subject: Bot AI: don't try to rocket-jump when using a jumppad or following a hardwired link
X-Git-Tag: xonotic-v0.8.5~1923^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=14fa88057f502886ffe8cc199d4ecf47aab8f906;p=xonotic%2Fxonotic-data.pk3dir.git

Bot AI: don't try to rocket-jump when using a jumppad or following a hardwired link
---

diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc
index e9d5905b8..f5ba20c8a 100644
--- a/qcsrc/server/bot/default/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/default/havocbot/havocbot.qc
@@ -669,7 +669,8 @@ void havocbot_movetogoal(entity this)
 
 			return;
 		}
-		else if(GetResourceAmount(this, RESOURCE_HEALTH) + GetResourceAmount(this, RESOURCE_ARMOR) > ROCKETJUMP_DAMAGE())
+		else if(!this.jumppadcount && !this.goalcurrent.wphardwired
+			&& GetResourceAmount(this, RESOURCE_HEALTH) + GetResourceAmount(this, RESOURCE_ARMOR) > ROCKETJUMP_DAMAGE())
 		{
 			if(this.velocity.z < 0)
 			{