From 4e7870c634d7b81905a976e0545e6a138f533ff8 Mon Sep 17 00:00:00 2001
From: "Michael Cook (mackal)" <mcook@mackal.net>
Date: Wed, 30 Aug 2017 15:17:02 -0400
Subject: [PATCH] Don't set reuse timer in UseDiscipline in case CastSpell
 fails

---
 zone/effects.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zone/effects.cpp b/zone/effects.cpp
index adc7b16b2..2741a924b 100644
--- a/zone/effects.cpp
+++ b/zone/effects.cpp
@@ -613,7 +613,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
 
 	//Check the disc timer
 	pTimerType DiscTimer = pTimerDisciplineReuseStart + spell.EndurTimerIndex;
-	if(!p_timers.Expired(&database, DiscTimer)) {
+	if(!p_timers.Expired(&database, DiscTimer, false)) { // lets not set the reuse timer in case CastSpell fails (or we would have to turn off the timer, but CastSpell will set it as well)
 		/*char val1[20]={0};*/	//unused
 		/*char val2[20]={0};*/	//unused
 		uint32 remain = p_timers.GetRemainingTime(DiscTimer);