From 15b1d2ca8431f64b1ba27f252c3099a4a1cf5b22 Mon Sep 17 00:00:00 2001
From: Roman Trapeznikov <roma190505@yandex.ru>
Date: Sat, 4 Jun 2022 16:23:00 +0300
Subject: [PATCH] lint fixes

---
 assets/src/ba_data/python/bastd/game/assault.py        | 8 ++++----
 assets/src/ba_data/python/bastd/game/capturetheflag.py | 3 +--
 assets/src/ba_data/python/bastd/game/kingofthehill.py  | 3 +--
 assets/src/ba_data/python/bastd/game/race.py           | 3 +--
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/assets/src/ba_data/python/bastd/game/assault.py b/assets/src/ba_data/python/bastd/game/assault.py
index eee1a542..585b7d99 100644
--- a/assets/src/ba_data/python/bastd/game/assault.py
+++ b/assets/src/ba_data/python/bastd/game/assault.py
@@ -175,16 +175,16 @@ class AssaultGame(ba.TeamGameActivity[Player, Team]):
 
     def _handle_base_collide(self, team: Team) -> None:
         try:
-            spaz = ba.getcollision().sourcenode.getdelegate(
-                PlayerSpaz, True)
+            spaz = ba.getcollision().sourcenode.getdelegate(PlayerSpaz, True)
         except ba.NotFoundError:
             return
 
         if not spaz.is_alive():
             return
 
-        player = spaz.getplayer(Player, True)
-        if player is None:
+        try:
+            player = spaz.getplayer(Player, True)
+        except ba.NotFoundError:
             return
 
         # If its another team's player, they scored.
diff --git a/assets/src/ba_data/python/bastd/game/capturetheflag.py b/assets/src/ba_data/python/bastd/game/capturetheflag.py
index 51c2f785..2805f1cc 100644
--- a/assets/src/ba_data/python/bastd/game/capturetheflag.py
+++ b/assets/src/ba_data/python/bastd/game/capturetheflag.py
@@ -435,8 +435,7 @@ class CaptureTheFlagGame(ba.TeamGameActivity[Player, Team]):
         """
         player: Optional[Player]
         try:
-            spaz = ba.getcollision().sourcenode.getdelegate(
-                PlayerSpaz, True)
+            spaz = ba.getcollision().sourcenode.getdelegate(PlayerSpaz, True)
         except ba.NotFoundError:
             return
 
diff --git a/assets/src/ba_data/python/bastd/game/kingofthehill.py b/assets/src/ba_data/python/bastd/game/kingofthehill.py
index 9f8e220c..1ea3e9aa 100644
--- a/assets/src/ba_data/python/bastd/game/kingofthehill.py
+++ b/assets/src/ba_data/python/bastd/game/kingofthehill.py
@@ -239,8 +239,7 @@ class KingOfTheHillGame(ba.TeamGameActivity[Player, Team]):
 
     def _handle_player_flag_region_collide(self, colliding: bool) -> None:
         try:
-            spaz = ba.getcollision().sourcenode.getdelegate(
-                PlayerSpaz, True)
+            spaz = ba.getcollision().sourcenode.getdelegate(PlayerSpaz, True)
         except ba.NotFoundError:
             return
 
diff --git a/assets/src/ba_data/python/bastd/game/race.py b/assets/src/ba_data/python/bastd/game/race.py
index 59a20f0f..cdcdc777 100644
--- a/assets/src/ba_data/python/bastd/game/race.py
+++ b/assets/src/ba_data/python/bastd/game/race.py
@@ -224,8 +224,7 @@ class RaceGame(ba.TeamGameActivity[Player, Team]):
         collision = ba.getcollision()
         try:
             region = collision.sourcenode.getdelegate(RaceRegion, True)
-            spaz = collision.sourcenode.getdelegate(
-                PlayerSpaz, True)
+            spaz = collision.sourcenode.getdelegate(PlayerSpaz, True)
         except ba.NotFoundError:
             return