Handle flat.RenderingStatus entirely within SocketRelay

Author: VirxEC

rlbot/interface.py

@@ -48,7 +48,6 @@ class SocketRelay:
     controllable_team_info_handlers: list[
         Callable[[flat.ControllableTeamInfo], None]
     ] = []
-    rendering_status_handlers: list[Callable[[flat.RenderingStatus], None]] = []
     raw_handlers: list[Callable[[flat.CorePacket], None]] = []
 
     socket: sock | None = None
@@ -314,8 +313,7 @@ def handle_incoming_message(self, incoming_message: bytes) -> MsgHandlingResult:
                 for handler in self.controllable_team_info_handlers:
                     handler(controllable_team_info)
             case flat.RenderingStatus() as rendering_status:
-                for handler in self.rendering_status_handlers:
-                    handler(rendering_status)
+                self.can_render = rendering_status.status
             case _:
                 self.logger.warning(
                     "Received unknown message type: %s",

rlbot/managers/bot.py

@@ -76,9 +76,6 @@ def __init__(self, default_agent_id: str | None = None):
             self._handle_controllable_team_info
         )
         self._game_interface.packet_handlers.append(self._handle_packet)
-        self._game_interface.rendering_status_handlers.append(
-            self.rendering_status_update
-        )
 
         self.renderer = Renderer(self._game_interface)
 
@@ -224,15 +221,6 @@ def _handle_match_communication(self, match_comm: flat.MatchComm):
             match_comm.team_only,
         )
 
-    def rendering_status_update(self, update: flat.RenderingStatus):
-        """
-        Called when the server sends a rendering status update for ANY bot or script.
-
-        By default, this will update `self.renderer.can_render` if appropriate.
-        """
-        if update.is_bot and update.index == self.index:
-            self._game_interface.can_render = update.status
-
     def update_rendering_status(
         self,
         status: bool,

rlbot/managers/hivemind.py

@@ -78,9 +78,6 @@ def __init__(self, default_agent_id: str | None = None):
             self._handle_controllable_team_info
         )
         self._game_interface.packet_handlers.append(self._handle_packet)
-        self._game_interface.rendering_status_handlers.append(
-            self.rendering_status_update
-        )
 
         self.renderer = Renderer(self._game_interface)
 
@@ -225,15 +222,6 @@ def run(
             self.retire()
             del self._game_interface
 
-    def rendering_status_update(self, update: flat.RenderingStatus):
-        """
-        Called when the server sends a rendering status update for ANY bot or script.
-
-        By default, this will update `self.renderer.can_render` if appropriate.
-        """
-        if update.is_bot and update.index in self.indices:
-            self._game_interface.can_render = update.status
-
     def update_rendering_status(
         self,
         status: bool,

rlbot/managers/script.py

@@ -58,9 +58,6 @@ def __init__(self, default_agent_id: str | None = None):
             self._handle_ball_prediction
         )
         self._game_interface.packet_handlers.append(self._handle_packet)
-        self._game_interface.rendering_status_handlers.append(
-            self.rendering_status_update
-        )
 
         self.renderer = Renderer(self._game_interface)
 
@@ -184,15 +181,6 @@ def _handle_match_communication(self, match_comm: flat.MatchComm):
             match_comm.team_only,
         )
 
-    def rendering_status_update(self, update: flat.RenderingStatus):
-        """
-        Called when the server sends a rendering status update for ANY bot or script.
-
-        By default, this will update `self.renderer.can_render` if appropriate.
-        """
-        if not update.is_bot and update.index == self.index:
-            self._game_interface.can_render = update.status
-
     def update_rendering_status(
         self,
         status: bool,