From b0e353ea6aebc1c803626a9226bc171e4cca40df Mon Sep 17 00:00:00 2001 From: Musholic Date: Mon, 22 Apr 2024 15:15:50 +0200 Subject: [PATCH] Fix test (current dps + exception on missing source of triggered skills) --- spec/System/TestBuildImport_spec.lua | 2 +- src/Modules/CalcSetup.lua | 2 +- src/Modules/CalcTriggers.lua | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spec/System/TestBuildImport_spec.lua b/spec/System/TestBuildImport_spec.lua index a1d13d0a78..390a3479f8 100644 --- a/spec/System/TestBuildImport_spec.lua +++ b/spec/System/TestBuildImport_spec.lua @@ -19,6 +19,6 @@ expose("BuildImport #buildImport", function() --TODO: Ignite dps, Blessing support assert.are.equals("Fireball", build.calcsTab.mainEnv.player.mainSkill.skillCfg.skillName) - assert.are.equals(5226, round(build.calcsTab.mainOutput.FullDPS)) + assert.are.equals(4848, round(build.calcsTab.mainOutput.FullDPS)) end) end) diff --git a/src/Modules/CalcSetup.lua b/src/Modules/CalcSetup.lua index 992c53b984..b87fbe68b3 100644 --- a/src/Modules/CalcSetup.lua +++ b/src/Modules/CalcSetup.lua @@ -1414,7 +1414,7 @@ function calcs.initEnv(build, mode, override, specEnv) end end end - if not GlobalCache.grantedTriggeredSkills or #GlobalCache.grantedTriggeredSkills < #grantedTriggeredSkills then + if not GlobalCache.grantedTriggeredSkills or #GlobalCache.grantedTriggeredSkills ~= #grantedTriggeredSkills then GlobalCache.grantedTriggeredSkills = grantedTriggeredSkills build.buildFlag = true end diff --git a/src/Modules/CalcTriggers.lua b/src/Modules/CalcTriggers.lua index 406bd8d7ad..8847f7e080 100644 --- a/src/Modules/CalcTriggers.lua +++ b/src/Modules/CalcTriggers.lua @@ -814,6 +814,9 @@ local configTable = { break end end + if not source then + return + end -- The triggered skill inherits the source skill mods calcs.mergeSkillInstanceMods(env, env.player.mainSkill.skillModList, source.activeEffect)