Skip to content

Commit a1b0c35

Browse files
NicEastvillageVirxEC
authored andcommitted
Fix hiveminds and scripts not blocking correctly
1 parent 6a73c12 commit a1b0c35

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

rlbot/managers/hivemind.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,21 +170,18 @@ def _packet_processor(self, packet: flat.GamePacket):
170170

171171
def _run(self):
172172
running = True
173-
has_more_messages = True
174173

175174
while running:
176175
# If there might be more messages,
177176
# check for another one with blocking=False
178177
# if there are no more messages, process the latest packet
179178
# then wait for the next message with blocking=True
180179
match self._game_interface.handle_incoming_messages(
181-
blocking=not has_more_messages
180+
blocking=self._latest_packet is None
182181
):
183182
case MsgHandlingResult.TERMINATED:
184183
running = False
185184
case MsgHandlingResult.NO_INCOMING_MSGS:
186-
has_more_messages = False
187-
188185
if self._latest_packet is not None:
189186
self._packet_processor(self._latest_packet)
190187
self._latest_packet = None

rlbot/managers/script.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,21 +127,18 @@ def _packet_processor(self, packet: flat.GamePacket):
127127

128128
def _run(self):
129129
running = True
130-
has_more_messages = True
131130

132131
while running:
133132
# If there might be more messages,
134133
# check for another one with blocking=False
135134
# if there are no more messages, process the latest packet
136135
# then wait for the next message with blocking=True
137136
match self._game_interface.handle_incoming_messages(
138-
blocking=not has_more_messages
137+
blocking=self._latest_packet is None
139138
):
140139
case MsgHandlingResult.TERMINATED:
141140
running = False
142141
case MsgHandlingResult.NO_INCOMING_MSGS:
143-
has_more_messages = False
144-
145142
if self._latest_packet is not None:
146143
self._packet_processor(self._latest_packet)
147144
self._latest_packet = None

rlbot/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "2.0.0-beta.20"
1+
__version__ = "2.0.0-beta.21"

0 commit comments

Comments
 (0)