From a00fa806071e8ecf90d3562f3b936967aaa8d0ba Mon Sep 17 00:00:00 2001
From: Vlyan <vlyan26@gmail.com>
Date: Sat, 13 Feb 2021 17:29:14 +0100
Subject: [PATCH] Fix for undefined skillAssistance

---
 system/scripts/combat.js    | 2 +-
 system/scripts/dice/roll.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/scripts/combat.js b/system/scripts/combat.js
index 9317cb5..96575eb 100644
--- a/system/scripts/combat.js
+++ b/system/scripts/combat.js
@@ -104,7 +104,7 @@ export class CombatL5r5e extends Combat {
                             ? messageOptions.difficultyHidden
                             : cfg.difficultyHidden;
                     roll.l5r5e.voidPointUsed = !!messageOptions.useVoidPoint;
-                    roll.l5r5e.skillAssistance = messageOptions.skillAssistance;
+                    roll.l5r5e.skillAssistance = messageOptions.skillAssistance || 0;
 
                     roll.roll();
                     rnkMessage = await roll.toMessage({ flavor });
diff --git a/system/scripts/dice/roll.js b/system/scripts/dice/roll.js
index d3eefe8..2bc166c 100644
--- a/system/scripts/dice/roll.js
+++ b/system/scripts/dice/roll.js
@@ -116,7 +116,7 @@ export class RollL5r5e extends Roll {
             // count ring die + skill assistance
             this.l5r5e.keepLimit =
                 this.dice.reduce((acc, term) => (term instanceof game.l5r5e.RingDie ? acc + term.number : acc), 0) +
-                Math.max(0, this.l5r5e.skillAssistance);
+                Math.max(0, this.l5r5e.skillAssistance || 0);
 
             // if only bulk skill dice, count the skill dice
             if (!this.l5r5e.keepLimit) {