From 76a0918a78f412f610f371ee3022f8dbf3e5dc17 Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 31 Mar 2023 12:19:15 +0200
Subject: [PATCH] Fixed crash where null ability broke skills

---
 .../computeVariable/computeVariableAsSkill.js | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js
index 01d34101..b13ac43b 100644
--- a/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js
+++ b/app/imports/api/engine/computation/computeComputation/computeByType/computeVariable/computeVariableAsSkill.js
@@ -1,12 +1,12 @@
 import aggregate from './aggregate/index.js';
 
-export default function computeVariableAsSkill(computation, node, prop){
+export default function computeVariableAsSkill(computation, node, prop) {
   // Skills are based on some ability Modifier
   let ability = computation.scope[prop.ability];
   prop.abilityMod = ability?.modifier || 0;
 
   // Inherit the ability's skill effects and proficiencies if skill is not a save
-  if (prop.skillType !== 'save' && ability){
+  if (prop.skillType !== 'save' && ability) {
     aggregateAbilityEffects({
       computation,
       skillNode: node,
@@ -21,7 +21,7 @@ export default function computeVariableAsSkill(computation, node, prop){
   let profBonus = computation.scope['proficiencyBonus']?.value || 0;
 
   // Multiply the proficiency bonus by the actual proficiency
-  if(prop.proficiency === 0.49){
+  if (prop.proficiency === 0.49) {
     // Round down proficiency bonus in the special case
     profBonus = Math.floor(profBonus * 0.5);
   } else {
@@ -37,7 +37,7 @@ export default function computeVariableAsSkill(computation, node, prop){
   prop.effects = node.data.effects;
 
   // If there is no aggregator, determine if the prop can hide, then exit
-  if (!aggregator){
+  if (!aggregator) {
     prop.hide = statBase === undefined &&
       prop.proficiency == 0 ||
       undefined;
@@ -52,14 +52,14 @@ export default function computeVariableAsSkill(computation, node, prop){
   if (aggregator.set !== undefined) {
     result = aggregator.set;
   }
-  if (Number.isFinite(result)){
+  if (Number.isFinite(result)) {
     result = Math.floor(result);
   }
   prop.value = result;
   // Advantage/disadvantage
-  if (aggregator.advantage && !aggregator.disadvantage){
+  if (aggregator.advantage && !aggregator.disadvantage) {
     prop.advantage = 1;
-  } else if (aggregator.disadvantage && !aggregator.advantage){
+  } else if (aggregator.disadvantage && !aggregator.advantage) {
     prop.advantage = -1;
   } else {
     prop.advantage = 0;
@@ -76,7 +76,8 @@ export default function computeVariableAsSkill(computation, node, prop){
   prop.rollBonuses = aggregator.rollBonus;
 }
 
-function aggregateAbilityEffects({computation, skillNode, abilityNode}){
+function aggregateAbilityEffects({ computation, skillNode, abilityNode }) {
+  if (!abilityNode?.id) return;
   computation.dependencyGraph.forEachLinkedNode(
     abilityNode.id,
     (linkedNode, link) => {
@@ -85,15 +86,15 @@ function aggregateAbilityEffects({computation, skillNode, abilityNode}){
       if (linkedNode.data.inactive) return;
       // Check that the link is a valid effect/proficiency to pass on
       // to a skill from its ability
-      if (link.data === 'effect'){
+      if (link.data === 'effect') {
         if (![
           'advantage', 'disadvantage', 'passiveAdd', 'fail', 'conditional'
-        ].includes(linkedNode.data.operation)){
+        ].includes(linkedNode.data.operation)) {
           return;
         }
       }
       // Apply the aggregations
-      let arg = {node: skillNode, linkedNode, link};
+      let arg = { node: skillNode, linkedNode, link };
       aggregate.effect(arg);
       aggregate.proficiency(arg);
     },