Fix crash on unusable weapon swap

PathOfBuildingCommunity · Aug 9, 2023 · 74132d8 · 74132d8
1 parent 1981887
commit 74132d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Modules/CalcOffence.lua b/src/Modules/CalcOffence.lua
@@ -1522,7 +1522,7 @@ function calcs.offence(env, actor, activeSkill)
 		if GlobalCache.cachedData["CACHE"][uuid] then
 			local cachedTriggerData = GlobalCache.cachedData["CACHE"][uuid]
 			local manaThreshold = output.ManaCost * reqManaCostMulti
-			local manaSpendPerSec = cachedTriggerData.ManaCost * cachedTriggerData.Speed
+			local manaSpendPerSec = (cachedTriggerData.ManaCost or 0) * (cachedTriggerData.Speed or 0)
 			local manaSpendTriggerRate = manaSpendPerSec / manaThreshold
 			output.SourceTriggerRate = manaSpendTriggerRate
 			local trigRate = m_min(manaSpendTriggerRate, skillData.triggerRate)

diff --git a/src/Modules/CalcPerform.lua b/src/Modules/CalcPerform.lua
@@ -3539,8 +3539,8 @@ function calcs.perform(env, avoidCache, fullDPSSkipEHP)
 
 				if GlobalCache.cachedData["CACHE"][uuid] then
 					-- Below code sets the trigger skill to highest APS skill it finds that meets all conditions
-					local cachedSpeed = GlobalCache.cachedData["CACHE"][uuid].Speed
-					local cachedManaCost = GlobalCache.cachedData["CACHE"][uuid].ManaCost
+					local cachedSpeed = GlobalCache.cachedData["CACHE"][uuid].Speed or 0
+					local cachedManaCost = GlobalCache.cachedData["CACHE"][uuid].ManaCost or 0
 					local ManaSpendRate = cachedSpeed * cachedManaCost
 
 					if ((not source and ManaSpendRate) or (ManaSpendRate and ManaSpendRate > trigRate)) then