Merge pull request freeciv#404 from kvilhaugsvik/bugfix

Improve client side data
kmodexc · Jun 15, 2021 · 3b65375 · 3b65375
2 parents ef36d5a + 212c7df
commit 3b65375
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/freeciv-web/src/main/webapp/javascript/action_dialog.js b/freeciv-web/src/main/webapp/javascript/action_dialog.js
@@ -65,6 +65,8 @@ function act_sel_queue_done(actor_unit_id)
 {
   /* Stop waiting. Move on to the next queued unit. */
   is_more_user_input_needed = false;
+  action_selection_restart = false;
+  did_not_decide = false;
   act_sel_queue_may_be_done(actor_unit_id);
 }
 

diff --git a/freeciv-web/src/main/webapp/javascript/packhand.js b/freeciv-web/src/main/webapp/javascript/packhand.js
@@ -792,6 +792,12 @@ function handle_unit_packet_common(packet_unit)
 
     update_unit_anim_list(units[packet_unit['id']], packet_unit);
     units[packet_unit['id']] = $.extend(units[packet_unit['id']], packet_unit);
+
+    for (var i = 0; i < current_focus.length; i++) {
+      if (current_focus[i]['id'] == packet_unit['id']) {
+        $.extend(current_focus[i], packet_unit);
+      }
+    }
   }
 
   update_tile_unit(units[packet_unit['id']]);