Skip to content

Commit 8210e62

Browse files
MahtraDRclaude
andauthored
fix(hunting-buddy): remove 30s force-kill, defer to combat-trainer cleanup (elanthia-online#7358)
## Summary - Removes the 30s force-kill timer that would `stop_script('combat-trainer')` mid-combat, bypassing weapon stow and leaving loaded weapons in hand - Now that combat-trainer has its own 120s kill phase timeout (elanthia-online#7357), this force-kill is redundant and harmful - Reverts to a simple `pause 1 while` wait loop, letting combat-trainer finish its own cleanup ## Test plan - [ ] Hunt with a ranged weapon until skills reach threshold -- verify combat-trainer cleans up on its own (no force-kill warning) - [ ] Hunt with a melee weapon -- verify normal cleanup still works - [ ] Kill hunting-buddy mid-hunt -- `before_dying` block still force-stops combat-trainer (unchanged, separate concern) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 684f2c2 commit 8210e62

1 file changed

Lines changed: 1 addition & 9 deletions

File tree

hunting-buddy.lic

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -655,15 +655,7 @@ class HuntingBuddy
655655
notify_hook(:after_hunt, self, hunting_room: hunting_room, counter: counter)
656656

657657
$COMBAT_TRAINER.stop
658-
ct_stop_timer = Time.now
659-
while Script.running?('combat-trainer') && $COMBAT_TRAINER.running
660-
if Time.now - ct_stop_timer > 30
661-
DRC.message("***WARNING*** combat-trainer did not stop gracefully after 30s, force-killing")
662-
stop_script('combat-trainer') if Script.running?('combat-trainer')
663-
break
664-
end
665-
pause 1
666-
end
658+
pause 1 while $COMBAT_TRAINER.running || Script.running?('combat-trainer')
667659
DRC.retreat
668660
end
669661

0 commit comments

Comments
 (0)