Merge branch 'PathOfBuildingCommunity:dev' into dev

PathOfBuildingCommunity · Aug 17, 2024 · 7dbbdf1 · 7dbbdf1
2 parents a34de95 + 7cce7a7
commit 7dbbdf1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## [v2.48.1](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.48.1) (2024/08/15)
+
+[Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.48.0...v2.48.1)
+
+<!-- Release notes generated using configuration in .github/release.yml at dev -->
+
+### Fixed Crashes
+* Fix crash when selecting Damage Over Time as the Enemy Damage Type by @Wires77
+
+
 ## [v2.48.0](https://github.com/PathOfBuildingCommunity/PathOfBuilding/tree/v2.48.0) (2024/08/15)
 
 [Full Changelog](https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.47.3...v2.48.0)

diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+VERSION[2.48.1][2024/08/15]
+
+--- Fixed Crashes ---
+* Fix crash when selecting Damage Over Time as the Enemy Damage Type (Wires77)
+
 VERSION[2.48.0][2024/08/15]
 
 --- New to Path of Building ---

diff --git a/manifest.xml b/manifest.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <PoBVersion>
-	<Version number="2.48.0" />
+	<Version number="2.48.1" />
 	<Source part="default" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/" />
 	<Source part="runtime" platform="win32" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/runtime/" />
 	<Source part="program" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/src/" />
 	<Source part="tree" url="https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding/{branch}/src/" />
-	<File name="changelog.txt" part="default" sha1="540fa0e7bdc755b02968df55b058d17f8ca200a6" />
+	<File name="changelog.txt" part="default" sha1="e22e1606f649314474956c4a514947f21ef1dca4" />
 	<File name="help.txt" part="default" sha1="e486cb63a78f5ca355430b67fa23e02fd30f5771" />
 	<File name="LICENSE.md" part="default" sha1="c77635aa1ba0a2ffe8eb72f93b3376e3a3d2041a" />
 	<File name="Assets/ascendants/ascendant.jpeg" part="program" sha1="c9edaa10dad44c5361f873e68fa39a831338e9ec" />
@@ -256,7 +256,7 @@
 	<File name="Modules/BuildSiteTools.lua" part="program" sha1="1200028c50af6960b58c4ed60395ef8ea1c156c1" />
 	<File name="Modules/CalcActiveSkill.lua" part="program" sha1="22e6dbb202ee140bb731aa96a5c8f8f3f93ee81f" />
 	<File name="Modules/CalcBreakdown.lua" part="program" sha1="edd6c08679fa4c7ed667895f86c7ee67257bfcf0" />
-	<File name="Modules/CalcDefence.lua" part="program" sha1="297dad9dd961c217d2b1b5ba83960f7f2cbe5d44" />
+	<File name="Modules/CalcDefence.lua" part="program" sha1="5753fd3cdfdd89e03479957dd5852b74b8736575" />
 	<File name="Modules/CalcMirages.lua" part="program" sha1="c5da8d4d022c2ac6cd3c3f644229473ef430199f" />
 	<File name="Modules/CalcOffence.lua" part="program" sha1="422fc17adaadb99d2e3ba6462e86e020c0a2cfb1" />
 	<File name="Modules/CalcPerform.lua" part="program" sha1="f73ff53fc5f5ca992d2d31893ffa0be56123f875" />

diff --git a/src/Modules/CalcDefence.lua b/src/Modules/CalcDefence.lua
@@ -3303,7 +3303,7 @@ function calcs.buildDefenceEstimations(env, actor)
 				}
 			end
 		end
-		local enemyCritAilmentEffect = 1 + output.EnemyCritChance / 100 * 0.5 * (1 - output.CritExtraDamageReduction / 100)
+		local enemyCritAilmentEffect = 1 + (output.EnemyCritChance or 0) / 100 * 0.5 * (1 - output.CritExtraDamageReduction / 100)
 		-- this is just used so that ailments don't always showup if the enemy has no other way of applying the ailment and they have a low crit chance
 		local enemyCritThreshold = 10.1
 		local enemyBleedChance = 0