Merge branch 'master' into mand1nga/bot-navigation-fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / bot / havocbot / havocbot.qc

diff --git a/qcsrc/server/bot/havocbot/havocbot.qc b/qcsrc/server/bot/havocbot/havocbot.qc
index 28352cd89492ef2233d878565ae404ec1aa4262d..d8287df1696934aa3481f4cfccf2c4240e697c4e 100644 (file)
--- a/qcsrc/server/bot/havocbot/havocbot.qc
+++ b/qcsrc/server/bot/havocbot/havocbot.qc
@@ -507,6 +507,10 @@ void havocbot_movetogoal()
                                }
                                return;
                        }
+
+                       // Don't chase players while using a jump pad
+                       if(self.goalcurrent.classname=="player" || self.goalstack01.classname=="player")
+                               return;
                }
        }
        else if(self.aistatus & AI_STATUS_OUT_JUMPPAD)