fixed #37: fade option bug (partial revert of e7f8bc0)

nyyr · Jul 23, 2018 · bd886b6 · bd886b6
1 parent 8d29769
commit bd886b6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Core.lua b/Core.lua
@@ -1035,8 +1035,10 @@ function ArcHUD:CombatStatus(event, arg1, arg2)
 			self.PlayerIsRegenOn = false
 		end
 	elseif(event == "PLAYER_LEAVE_COMBAT" or event == "PLAYER_REGEN_ENABLED") then
-		self.PlayerIsInCombat = false
-		if(event == "PLAYER_REGEN_ENABLED") then
+		if(event == "PLAYER_LEAVE_COMBAT" and self.PlayerIsRegenOn) then
+			self.PlayerIsInCombat = false
+		elseif(event == "PLAYER_REGEN_ENABLED") then
+			self.PlayerIsInCombat = false
 			self.PlayerIsRegenOn = true
 		end
 	elseif(event == "PET_ATTACK_START") then