diff --git a/tasks/map/control/control.py b/tasks/map/control/control.py index 799d1ef13..844bc8788 100644 --- a/tasks/map/control/control.py +++ b/tasks/map/control/control.py @@ -177,6 +177,12 @@ class MapControl(Combat, AimDetectorMixin): if waypoint.early_stop: return result if self.walk_additional(): + # Clearing items may trigger additional popups + if attacked_item.started() and attacked_item.reached(): + logger.info('Walk result add: item') + result.append('item') + if 'item' in waypoint.expected_end and waypoint.early_stop: + return result attacked_enemy.clear() attacked_item.clear() continue @@ -228,7 +234,7 @@ class MapControl(Combat, AimDetectorMixin): if attacked_item.started() and attacked_item.reached(): logger.info('Walk result add: item') result.append('item') - if waypoint.early_stop: + if 'item' in waypoint.expected_end and waypoint.early_stop: return result if waypoint.interact_radius > 0: if diff < waypoint.interact_radius: