From a6d1652f449cfec89e899be5c89f6e362133d0b6 Mon Sep 17 00:00:00 2001
From: KayenEQ <kayen85@gmail.com>
Date: Wed, 9 Feb 2022 18:02:45 -0500
Subject: [PATCH] fixed (#1983)

---
 zone/aa.cpp     | 9 ++++++---
 zone/spells.cpp | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/zone/aa.cpp b/zone/aa.cpp
index a05f9dc47..b5a85f5e6 100644
--- a/zone/aa.cpp
+++ b/zone/aa.cpp
@@ -1333,9 +1333,12 @@ void Client::SetAARecastTimer(AA::Rank *rank_in, int32 spell_id) {
 		return;
 	}
 
-	//calculate AA cooldown
-	int timer_duration = rank_in->recast_time - GetAlternateAdvancementCooldownReduction(rank_in);
-	
+	int timer_duration = rank_in->recast_time;
+
+	if (timer_duration) {
+		timer_duration = rank_in->recast_time - GetAlternateAdvancementCooldownReduction(rank_in);
+	}
+
 	if (timer_duration <= 0) {
 		return;
 	}
diff --git a/zone/spells.cpp b/zone/spells.cpp
index b9b8a66ef..93e649a7d 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -6226,9 +6226,9 @@ void Client::SetDisciplineRecastTimer(int32 spell_id) {
 		if (GetPTimers().Enabled((uint32)DiscTimer)) {
 			GetPTimers().Clear(&database, (uint32)DiscTimer);
 		}
-		else {
-			timer_duration -= focus;
-		}
+	}
+	else {
+		timer_duration -= focus;
 	}
 
 	if (timer_duration <= 0) {