From 43a9124ce7cd6c719c9619a58ce68c52ec93a2af Mon Sep 17 00:00:00 2001
From: mordred <you@example.com>
Date: Tue, 6 Nov 2018 10:36:45 +0100
Subject: [PATCH] Store and load territoryID

---
 src/servers/sapphire_zone/Actor/Player.h      |  1 +
 src/servers/sapphire_zone/Actor/PlayerSql.cpp |  3 ++-
 src/servers/sapphire_zone/Zone/Zone.h         | 10 ++++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 51043a6c..59b1f931 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -998,6 +998,7 @@ namespace Core::Entity
     bool m_bAutoattack;
 
     Common::ZoneingType m_zoningType;
+    uint16_t m_territoryId;
 
     bool m_bMarkedForZoning;
     bool m_bNewAdventurer;
diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index ab1b7704..1773c0c3 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -50,6 +50,7 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
   strcpy( m_name, name.c_str() );
 
   auto zoneId = res->getUInt( "TerritoryType" );
+  m_territoryId = res->getUInt( "TerritoryId" );
   m_prevZoneId = res->getUInt( "OTerritoryType" );
 
   // Position
@@ -365,7 +366,7 @@ void Core::Entity::Player::updateSql()
   stmt->setInt( 17, static_cast< uint32_t >( m_bNewAdventurer ) );
 
   stmt->setInt( 18, m_zoneId ); // TerritoryType
-  stmt->setInt( 19, 0 ); // TerritoryId
+  stmt->setInt( 19, m_territoryId ); // TerritoryId
   stmt->setDouble( 20, m_pos.x );
   stmt->setDouble( 21, m_pos.y );
   stmt->setDouble( 22, m_pos.z );
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 9a7f652a..52530044 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -16,7 +16,8 @@
 #include <stdio.h>
 #include <string.h>
 
-namespace Core {
+namespace Core 
+{
 
 class Session;
 
@@ -25,9 +26,10 @@ class ZonePosition;
 using SessionSet = std::set< SessionPtr >;
 using FestivalPair = std::pair< uint16_t, uint16_t >;
 
-namespace Data {
-struct InstanceContent;
-struct TerritoryType;
+namespace Data 
+{
+  struct InstanceContent;
+  struct TerritoryType;
 }
 
 class Zone : public CellHandler< Cell >, public std::enable_shared_from_this< Zone >