Fix hiveminds and scripts not blocking correctly

VirxEC · Jan 25, 2025 · a1b0c35 · a1b0c35
1 parent 6a73c12
commit a1b0c35
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/rlbot/managers/hivemind.py b/rlbot/managers/hivemind.py
@@ -170,21 +170,18 @@ def _packet_processor(self, packet: flat.GamePacket):
 
     def _run(self):
         running = True
-        has_more_messages = True
 
         while running:
             # If there might be more messages,
             # check for another one with blocking=False
             # if there are no more messages, process the latest packet
             # then wait for the next message with blocking=True
             match self._game_interface.handle_incoming_messages(
-                blocking=not has_more_messages
+                blocking=self._latest_packet is None
             ):
                 case MsgHandlingResult.TERMINATED:
                     running = False
                 case MsgHandlingResult.NO_INCOMING_MSGS:
-                    has_more_messages = False
-
                     if self._latest_packet is not None:
                         self._packet_processor(self._latest_packet)
                         self._latest_packet = None

diff --git a/rlbot/managers/script.py b/rlbot/managers/script.py
@@ -127,21 +127,18 @@ def _packet_processor(self, packet: flat.GamePacket):
 
     def _run(self):
         running = True
-        has_more_messages = True
 
         while running:
             # If there might be more messages,
             # check for another one with blocking=False
             # if there are no more messages, process the latest packet
             # then wait for the next message with blocking=True
             match self._game_interface.handle_incoming_messages(
-                blocking=not has_more_messages
+                blocking=self._latest_packet is None
             ):
                 case MsgHandlingResult.TERMINATED:
                     running = False
                 case MsgHandlingResult.NO_INCOMING_MSGS:
-                    has_more_messages = False
-
                     if self._latest_packet is not None:
                         self._packet_processor(self._latest_packet)
                         self._latest_packet = None

diff --git a/rlbot/version.py b/rlbot/version.py
@@ -1 +1 @@
-__version__ = "2.0.0-beta.20"
+__version__ = "2.0.0-beta.21"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		__version__ = "2.0.0-beta.20"
		__version__ = "2.0.0-beta.21"