diff --git a/modules/combat-ffg.js b/modules/combat-ffg.js index 75df8ae2..f5009648 100644 --- a/modules/combat-ffg.js +++ b/modules/combat-ffg.js @@ -216,7 +216,11 @@ export class CombatFFG extends Combat { * @returns {*|*[]} - a list of combatant IDs (NOT token IDs, NOT actor IDs) */ getClaims(round) { - return this.getFlag('starwarsffg', 'combatClaims')[round] || []; + const combatClaims = this.getFlag('starwarsffg', 'combatClaims'); + if (combatClaims) { + return combatClaims[round] || []; + } + return []; } /**