Merge branch 'master' into dev

# Conflicts:
#	CHANGELOG.md
#	system/system.json

CHANGELOG.md

@@ -40,6 +40,11 @@ Technique syntaxe "quick" explanation :
         - `melee,ranged,unarmed`
         - `martial,fitness,performance`
 
+## 1.6.1 - Little Bugfixes
+- PC sheet : fixed the "Complete this rank" button who stayed hidden in experience tab.
+- GmMonitor : fixed a bug with render when the list was emptied.
+- Combat : fixed a null error when sometimes the combatant actor is null.
+
 ## 1.6.0 - QoL & SoftLock
 - PC/NPC/Armies sheet:
   - Added SoftLock functionality.

system/scripts/combat.js

@@ -142,14 +142,14 @@ export class CombatL5r5e extends Combat {
      * @private
      */
     _sortCombatants(a, b) {
-        // if tie, sort by honor, less honorable first
+        // if tie : sort by honor, less honorable first
         if (a.initiative === b.initiative) {
-            // skip if armies
-            if (a.actor.data.type === "army" || b.actor.data.type === "army") {
+            // skip if no actor or if armies
+            if (!a.actor || !b.actor || a.actor.data.type === "army" || b.actor.data.type === "army") {
                 return 0;
             }
 
-            // if tie, Character > Adversary > Minion
+            // if tie again : Character > Adversary > Minion
             if (a.actor.data.data.social.honor === b.actor.data.data.social.honor) {
                 return (
                     CombatL5r5e._getWeightByActorType(a.actor.data) - CombatL5r5e._getWeightByActorType(b.actor.data)

system/scripts/gm/gm-monitor.js

@@ -330,6 +330,7 @@ export class GmMonitor extends FormApplication {
         }
         if (!foundry.utils.isObjectEmpty(updateData)) {
             await actor.update(updateData);
+            this.render(false);
         }
     }
 

system/templates/actors/character/experience.html

@@ -55,7 +55,7 @@
                         <th>{{localize 'l5r5e.advancements.total_xp_curriculum'}} : {{rankObject.spent.curriculum}}{{#if rankObject.goal}} / {{rankObject.goal}}{{/if}}</th>
                         <th>{{localize 'l5r5e.advancements.total_xp_spent'}} : {{rankObject.spent.total}}</th>
                     </tr>
-                    {{#if data.editable_not_soft_locked}}
+                    {{#if ../data.editable_not_soft_locked}}
                         {{#ifCond ../data.data.identity.school_rank '<' 6}}
                             {{#ifCond (ifCond ../data.data.identity.school_rank '==' rankObject.rank) '&&' (ifCond rankObject.spent.curriculum '>=' rankObject.goal)}}
                                 <tr class="tfoot flexrow row tab" data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}">