From 438689d3feb91ed0fe07b32a15d0ad9e83c774ae Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 15 Feb 2017 16:15:03 +0100 Subject: [PATCH] If for some reason final goal was removed clear route instead of simply removing it --- qcsrc/server/bot/default/havocbot/havocbot.qc | 8 +++++++- qcsrc/server/bot/default/navigation.qc | 3 --- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/qcsrc/server/bot/default/havocbot/havocbot.qc b/qcsrc/server/bot/default/havocbot/havocbot.qc index ba8757502b..3d4e298d13 100644 --- a/qcsrc/server/bot/default/havocbot/havocbot.qc +++ b/qcsrc/server/bot/default/havocbot/havocbot.qc @@ -676,7 +676,13 @@ void havocbot_movetogoal(entity this) bool locked_goal = false; - if(this.goalentity.bot_pickup) + if(this.goalentity && wasfreed(this.goalentity)) + { + navigation_clearroute(this); + this.bot_strategytime = 0; + return; + } + else if(this.goalentity.bot_pickup) { if(this.goalentity.bot_pickup_respawning) { diff --git a/qcsrc/server/bot/default/navigation.qc b/qcsrc/server/bot/default/navigation.qc index 95d787e002..0883bacd02 100644 --- a/qcsrc/server/bot/default/navigation.qc +++ b/qcsrc/server/bot/default/navigation.qc @@ -927,9 +927,6 @@ void navigation_poptouchedgoals(entity this) m1 = org + this.mins; m2 = org + this.maxs; - while(this.goalcurrent && wasfreed(this.goalcurrent)) - navigation_poproute(this); - if(this.goalcurrent.wpflags & WAYPOINTFLAG_TELEPORT) { // make sure jumppad is really hit, don't rely on distance based checks -- 2.39.2