Merge branch 'development'

Sonaza · Mar 31, 2017 · eb29166 · eb29166
2 parents efdcc93 + 92bd750
commit eb29166
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.1.1
+* Fixed one more bug introduced by the recent patch.
+
 ## 2.1.0
 * Merged artifact bar fix submitted by Superfat72. Thanks!
 * TOC bump for patch 7.2.0.

diff --git a/Experiencer.toc b/Experiencer.toc
@@ -2,7 +2,7 @@
 ## Title: Experiencer
 ## Notes: Simple and Advanced Experience and Reputation Progress Bar
 ## Author: Sonaza
-## Version: 2.1.0
+## Version: 2.1.1
 ## OptionalDeps: Ace3
 ## SavedVariables: ExperiencerDB, ExperiencerDB_module_experience, ExperiencerDB_module_reputation, ExperiencerDB_module_artifact, ExperiencerDB_module_honor
 

diff --git a/modules/artifact.lua b/modules/artifact.lua
@@ -71,12 +71,12 @@ end
 function module:CalculateTotalArtifactPower()
 	if(not HasArtifactEquipped()) then return 0 end
 
-	local _, _, _, _, currentXP, pointsSpent = C_ArtifactUI.GetEquippedArtifactInfo();
+	local _, _, _, _, currentXP, pointsSpent, _, _, _, _, _, _, artifactTier = C_ArtifactUI.GetEquippedArtifactInfo();
 
 	local totalXP = 0;
 
 	for i=0, pointsSpent-1 do
-		local numPoints, artifactXP, xpForNextPoint = MainMenuBar_GetNumArtifactTraitsPurchasableFromXP(i, 0);
+		local numPoints, artifactXP, xpForNextPoint = MainMenuBar_GetNumArtifactTraitsPurchasableFromXP(i, 0, artifactTier);
 		totalXP = totalXP + xpForNextPoint;
 	end