From: terencehill <piuntn@gmail.com>
Date: Tue, 14 Feb 2017 14:48:58 +0000 (+0100)
Subject: Remove an item about to spawn as goal if somebody else picked it up before bot reaches it
X-Git-Tag: xonotic-v0.8.2~202^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8622c2ce819db87161dcdc9958468f51fe7ba710;p=xonotic%2Fxonotic-data.pk3dir.git

Remove an item about to spawn as goal if somebody else picked it up before bot reaches it
---

diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc
index bfc72d60f..5d612e10f 100644
--- a/qcsrc/server/bot/default/navigation.qc
+++ b/qcsrc/server/bot/default/navigation.qc
@@ -946,7 +946,10 @@ void navigation_poptouchedgoals(entity this)
 	if(this.goalcurrent.bot_pickup_respawning)
 	{
 		if(!this.goalcurrent.solid)
-			return;
+		{
+			if(time > this.goalcurrent.scheduledrespawntime - 10) // item not yet taken (by someone else)
+				return; // wait for item to respawn
+		}
 		this.goalcurrent.bot_pickup_respawning = false;
 	}