From 46b19e8e6f41045b6411c274f59078a502565cc1 Mon Sep 17 00:00:00 2001
From: "Michael Cook (mackal)" <mcook@mackal.net>
Date: Mon, 20 Feb 2017 18:41:17 -0500
Subject: [PATCH] Disable the aggro meter timer if it's not enabled

---
 zone/client.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zone/client.cpp b/zone/client.cpp
index 9e02195c0..5f3d3ac81 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -8775,8 +8775,10 @@ void Client::CheckRegionTypeChanges()
 
 void Client::ProcessAggroMeter()
 {
-	if (!AggroMeterAvailable())
+	if (!AggroMeterAvailable()) {
+		aggro_meter_timer.Disable();
 		return;
+	}
 
 	// we need to decide if we need to send OP_AggroMeterTargetInfo now
 	// This packet sends the current lock target ID and the current target ID