From 1e05ee76f18e289e3eb3dd20129e796487a16e4b Mon Sep 17 00:00:00 2001
From: Uleat <uleat.charismata@gmail.com>
Date: Wed, 13 Apr 2016 19:29:00 -0400
Subject: [PATCH] Fix for Bot::AI_Process() not advancing the heal rotation
 when member is currently casting for said heal rotation

---
 zone/bot.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/zone/bot.cpp b/zone/bot.cpp
index ed33fe8e8..d8693251a 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -2211,10 +2211,16 @@ void Bot::AI_Process() {
 			m_member_of_heal_rotation->CastingReady() &&
 			m_member_of_heal_rotation->CastingMember() == this &&
 			!m_member_of_heal_rotation->MemberIsCasting(this)
-		)
+		) {
 			InterruptSpell();
-		else if (botClass != BARD)
+		}
+		else if (AmICastingForHealRotation() && m_member_of_heal_rotation->CastingMember() == this) {
+			AdvanceHealRotation(false);
 			return;
+		}
+		else if (botClass != BARD) {
+			return;
+		}
 	}
 	else if (IsHealRotationMember()) {
 		m_member_of_heal_rotation->SetMemberIsCasting(this, false);
@@ -8385,6 +8391,8 @@ bool Bot::IsMyHealRotationSet()
 		return false;
 	if (m_member_of_heal_rotation->CastingMember() != this)
 		return false;
+	if (m_member_of_heal_rotation->MemberIsCasting(this))
+		return false;
 	if (!m_member_of_heal_rotation->PokeCastingTarget())
 		return false;