Near-infinite loop fix for when crafter cannot continue (fixes #70530) (

#73820) * Near-infinite loop fix for when crafter cannot continue. * Update src/activity_actor.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update src/activity_actor.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: Draper, Daniel <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · May 18, 2024 · a61503f · a61503f
1 parent 65c14e9
commit a61503f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/activity_actor.cpp b/src/activity_actor.cpp
@@ -3652,6 +3652,7 @@ void craft_activity_actor::do_turn( player_activity &act, Character &crafter )
     const int assistants = crafter.available_assistant_count( craft.get_making() );
 
     if( crafting_speed <= 0.0f ) {
+        craft.erase_var( "crafter" );
         crafter.cancel_activity();
         return;
     }
@@ -3724,6 +3725,7 @@ void craft_activity_actor::do_turn( player_activity &act, Character &crafter )
         if( !crafter.craft_consume_tools( craft, five_percent_steps, false ) ) {
             // So we don't skip over any tool comsuption
             craft.item_counter -= craft.item_counter % 500'000 + 1;
+            craft.erase_var( "crafter" );
             crafter.cancel_activity();
             return;
         }