fix spurious CTF flag_return_touches log errors

CHANGELOG.md

@@ -1,4 +1,4 @@
-### 1.7.33 (build 21793, api 8, 2024-03-15)
+### 1.7.33 (build 21794, api 8, 2024-03-15)
 - Stress test input-devices are now a bit smarter; they won't press any buttons
   while UIs are up (this could cause lots of chaos if it happened).
 - Added a 'Show Demos When Idle' option in advanced settings. If enabled, the

src/assets/ba_data/python/baenv.py

@@ -52,7 +52,7 @@
 
 # Build number and version of the ballistica binary we expect to be
 # using.
-TARGET_BALLISTICA_BUILD = 21793
+TARGET_BALLISTICA_BUILD = 21794
 TARGET_BALLISTICA_VERSION = '1.7.33'
 
 

src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py

@@ -527,7 +527,7 @@ def _handle_touching_own_flag(self, team: Team, connecting: bool) -> None:
                     team.touch_return_timer = None
                     team.touch_return_timer_ticking = None
             if team.flag_return_touches < 0:
-                logging.exception('CTF flag_return_touches < 0')
+                logging.error('CTF flag_return_touches < 0', stack_info=True)
 
     def _handle_death_flag_capture(self, player: Player) -> None:
         """Handles flag values when a player dies or leaves the game."""
@@ -536,22 +536,29 @@ def _handle_death_flag_capture(self, player: Player) -> None:
             return
 
         team = player.team
-        # For each "point" our player has touched theflag (Could be multiple),
-        # deduct one from both our player and
-        # the flag's return touches variable.
+
+        # For each "point" our player has touched theflag (Could be
+        # multiple), deduct one from both our player and the flag's
+        # return touches variable.
         for _ in range(player.touching_own_flag):
             # Deduct
             player.touching_own_flag -= 1
-            team.flag_return_touches -= 1
-            # Update our flag's timer accordingly
-            # (Prevents immediate resets in case
-            # there might be more people touching it).
-            if team.flag_return_touches == 0:
-                team.touch_return_timer = None
-                team.touch_return_timer_ticking = None
-            # Safety check, just to be sure!
-            if team.flag_return_touches < 0:
-                logging.exception('CTF flag_return_touches < 0')
+
+            # (This was only incremented if we have non-zero
+            # return-times).
+            if float(self.flag_touch_return_time) > 0.0:
+                team.flag_return_touches -= 1
+                # Update our flag's timer accordingly
+                # (Prevents immediate resets in case
+                # there might be more people touching it).
+                if team.flag_return_touches == 0:
+                    team.touch_return_timer = None
+                    team.touch_return_timer_ticking = None
+                # Safety check, just to be sure!
+                if team.flag_return_touches < 0:
+                    logging.error(
+                        'CTF flag_return_touches < 0', stack_info=True
+                    )
 
     def _flash_base(self, team: Team, length: float = 2.0) -> None:
         light = bs.newnode(

src/ballistica/shared/ballistica.cc

@@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int {
 namespace ballistica {
 
 // These are set automatically via script; don't modify them here.
-const int kEngineBuildNumber = 21793;
+const int kEngineBuildNumber = 21794;
 const char* kEngineVersion = "1.7.33";
 const int kEngineApiVersion = 8;