From dd3af7e6898beb995632cb05119f34f04fa93b2f Mon Sep 17 00:00:00 2001
From: Daniel Davies <daniel.l.davies@hotmail.co.uk>
Date: Tue, 5 May 2020 13:27:37 +0100
Subject: [PATCH] Deaggro on zone.

---
 src/world/Actor/BNpc.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 09b96793..5050c7d9 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -494,6 +494,12 @@ void Sapphire::Entity::BNpc::update( uint64_t tickCount )
       auto distanceOrig = Util::distance( getPos().x, getPos().y, getPos().z,
                                           m_spawnPos.x, m_spawnPos.y,  m_spawnPos.z );
 
+      if (pHatedActor && pHatedActor->getCurrentTerritory() != m_pCurrentTerritory )
+      {
+        hateListRemove( pHatedActor );
+        pHatedActor = hateListGetHighest();
+      }
+
       if( pHatedActor && !pHatedActor->isAlive() )
       {
         hateListRemove( pHatedActor );