oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: prevents a channel from being cleared out when there are event exceptions

Browse Source
This commit is contained in:
Duncan Brown
2022-07-18 12:46:38 -04:00
parent a1de32ea41
commit e633966727
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
addons/escoria-core/game/core-scripts/esc/esc_event_manager.gd
View File

@@ -292,10 +292,15 @@ func interrupt(exceptions: PoolStringArray = []) -> void:
_running_events[channel_name].interrupt() _running_events[channel_name].interrupt()
_channels_state[channel_name] = true _channels_state[channel_name] = true
var events_to_clear: Array = []
for channel_name in events_queue.keys(): for channel_name in events_queue.keys():
if events_queue[channel_name] != null: if events_queue[channel_name] != null:
var found_exception: bool = false
for event in events_queue[channel_name]: for event in events_queue[channel_name]:
if event.name in exceptions: if event.name in exceptions:
found_exception = true
continue continue
escoria.logger.debug( escoria.logger.debug(
@@ -303,7 +308,16 @@ func interrupt(exceptions: PoolStringArray = []) -> void:
"Interrupting queued event %s in channel %s..." "Interrupting queued event %s in channel %s..."
% [event.name, channel_name]) % [event.name, channel_name])
event.interrupt() event.interrupt()
events_to_clear.append(event)
# If we found an exception, we can't just clear out the entire
# channel's queue and so we remove everything but the exceptions in
# the channel. Otherwise, we're safe to just clear it out.
if found_exception:
for event in events_to_clear:
if events_queue[channel_name].has(event):
events_queue[channel_name].erase(event)
else:
events_queue[channel_name].clear() events_queue[channel_name].clear()