From 580c42006c4c022a875a0d4d8fe52fb94e35688e Mon Sep 17 00:00:00 2001 From: ineedbots Date: Fri, 3 Sep 2021 23:09:28 -0600 Subject: [PATCH] fix bots stuck when defusing --- raw/scripts/mp/botwarfare-compiled.gsc | Bin 19062 -> 19050 bytes raw/scripts/mp/botwarfare.gsc | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/raw/scripts/mp/botwarfare-compiled.gsc b/raw/scripts/mp/botwarfare-compiled.gsc index 99199037397b119c2b1c9be5b376bee8fcb5e915..d035c6b080c69b8d60ff3e9001d6bef24e57f998 100644 GIT binary patch delta 6645 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 PC!Qnr6ECueLE`@dFggwY delta 6725 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 X;(lTZ@l#?3@f>l4XzOPccM<;uk0vL) diff --git a/raw/scripts/mp/botwarfare.gsc b/raw/scripts/mp/botwarfare.gsc index cf0bfb1..820b532 100644 --- a/raw/scripts/mp/botwarfare.gsc +++ b/raw/scripts/mp/botwarfare.gsc @@ -1109,7 +1109,8 @@ bot_sd_defender( zone, isplanted ) //checked partially changed to match cerberus } } } - else if ( self atgoal( "sd_defend" ) || self bot_need_to_defuse() ) + + if ( self atgoal( "sd_defend" ) || self bot_need_to_defuse() ) { bot_sd_defender_think( zone );