From 9ccf678ef338c6afbdea68dd278e0711264813ff Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Sat, 30 Aug 2025 22:06:27 +0800 Subject: [PATCH] Fix: OSDaemon.combat_status() should accept end 'no_searching' (#5066) --- module/os_combat/combat.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/os_combat/combat.py b/module/os_combat/combat.py index f29702e9a..461ec5ad0 100644 --- a/module/os_combat/combat.py +++ b/module/os_combat/combat.py @@ -157,7 +157,9 @@ class Combat(Combat_, MapEventHandler): def combat_status(self, drop=None, expected_end=None): self.__os_combat_drop = drop - super().combat_status(drop=drop, expected_end=self._os_combat_expected_end) + if expected_end is None: + expected_end = self._os_combat_expected_end + super().combat_status(drop=drop, expected_end=expected_end) def combat(self, *args, save_get_items=False, **kwargs): """