From 1d54e322ca160cbb3d6af248f97ded4f44822ae6 Mon Sep 17 00:00:00 2001
From: Eric <ericfroemling@gmail.com>
Date: Wed, 27 Sep 2023 17:18:44 -0700
Subject: [PATCH] Latest public/internal sync.

---
 CHANGELOG.md                                           |  8 ++++++++
 src/assets/ba_data/python/bascenev1lib/actor/spaz.py   | 10 +++++-----
 .../ba_data/python/bascenev1lib/game/capturetheflag.py |  3 ---
 src/assets/ba_data/python/bauiv1lib/profile/edit.py    |  5 +----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7186e07..794a97c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,6 +80,14 @@
   and pop the transform stack based on C++ scoping instead of the old
   PushTransform/PopTransform. This should make it harder to accidentally break
   the transform stack with unbalanced components.
+- Fixes an issue related to incorrect die-message handling by hockey pucks (fix
+  #617). Thanks EraOSBeta!
+- Fixes an issue where clamped player-name would display incorrectly if extra
+  spaces are present (fix #618). Thanks vishal332008!
+- Fixes an issue where King of the Hill scoreboard did not display immediately
+  (fix #614). Thanks heLlow-step-sis!
+- Fixes an issue where CTF flag return counters could get stuck (fix #584).
+  Thanks SoK05 and Dliwk!
   
   
 ### 1.7.27 (build 21282, api 8, 2023-08-30)
diff --git a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py
index f8c4c178..e905d2a4 100644
--- a/src/assets/ba_data/python/bascenev1lib/actor/spaz.py
+++ b/src/assets/ba_data/python/bascenev1lib/actor/spaz.py
@@ -445,9 +445,7 @@ class Spaz(bs.Actor):
         Called to 'press punch' on this spaz;
         used for player or AI connections.
         """
-        if (not self.node
-            or self.frozen
-            or self.node.knockout > 0.0):
+        if not self.node or self.frozen or self.node.knockout > 0.0:
             return
         t_ms = int(bs.time() * 1000.0)
         assert isinstance(t_ms, int)
@@ -487,10 +485,12 @@ class Spaz(bs.Actor):
         Called to 'press bomb' on this spaz;
         used for player or AI connections.
         """
-        if (not self.node
+        if (
+            not self.node
             or self._dead
             or self.frozen
-            or self.node.knockout > 0.0):
+            or self.node.knockout > 0.0
+        ):
             return
         t_ms = int(bs.time() * 1000.0)
         assert isinstance(t_ms, int)
diff --git a/src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py b/src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py
index 07fd7992..4e5da2d6 100644
--- a/src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py
+++ b/src/assets/ba_data/python/bascenev1lib/game/capturetheflag.py
@@ -483,9 +483,6 @@ class CaptureTheFlagGame(bs.TeamGameActivity[Player, Team]):
         except bs.NotFoundError:
             return
 
-        if not spaz.is_alive():
-            return
-
         player = spaz.getplayer(Player, True)
 
         if player:
diff --git a/src/assets/ba_data/python/bauiv1lib/profile/edit.py b/src/assets/ba_data/python/bauiv1lib/profile/edit.py
index 5c5b56fd..5c9c899d 100644
--- a/src/assets/ba_data/python/bauiv1lib/profile/edit.py
+++ b/src/assets/ba_data/python/bauiv1lib/profile/edit.py
@@ -719,10 +719,7 @@ class EditProfileWindow(bui.Window):
             )
         if len(name) > 10 and not (self._global or self._is_account_profile):
             name = name.strip()
-            display_name = ((name[:10] + '...')
-                           if len(name) > 10
-                           else name
-            )
+            display_name = (name[:10] + '...') if len(name) > 10 else name
             bui.textwidget(
                 edit=self._clipped_name_text,
                 text=bui.Lstr(