From 790927052754ec368729212de5893c857fa9fb04 Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 9 Jul 2015 02:44:55 -0400 Subject: [PATCH] Make sure we actually have the AA they're trying to cast --- zone/aa.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/zone/aa.cpp b/zone/aa.cpp index 71274de61..307eb3ba8 100644 --- a/zone/aa.cpp +++ b/zone/aa.cpp @@ -1146,15 +1146,14 @@ void Client::ActivateAlternateAdvancementAbility(int rank_id, int target_id) { return; } - //if expendable make sure we have charges - if(ability->charges > 0) { - uint32 charges = 0; - GetAA(rank_id, &charges); + uint32 charges = 0; + // We don't have the AA + if (!GetAA(rank_id, &charges)) + return; - if(charges < 0) { - return; - } - } + //if expendable make sure we have charges + if(ability->charges > 0 && charges < 1) + return; //check cooldown if(!p_timers.Expired(&database, rank->spell_type + pTimerAAStart)) {