get/setCurrentTerritory now completely removed

src/world/Actor/GameObject.cpp

@@ -341,23 +341,11 @@ std::set< Sapphire::Entity::GameObjectPtr > Sapphire::Entity::GameObject::getInR
   return tempInRange;
 }
 
-/*! \return TerritoryPtr to the current zone, nullptr if not set */
-Sapphire::TerritoryPtr Sapphire::Entity::GameObject::getCurrentTerritory() const
-{
-  return m_pCurrentTerritory;
-}
-
 uint32_t Sapphire::Entity::GameObject::getTerritoryTypeId() const
 {
   return m_territoryTypeId;
 }
 
-/*! \param TerritoryPtr to the zone to be set as current */
-void Sapphire::Entity::GameObject::setCurrentZone( TerritoryPtr currZone )
-{
-  m_pCurrentTerritory = currZone;
-}
-
 void Sapphire::Entity::GameObject::setTerritoryTypeId( uint32_t territoryTypeId )
 {
   m_territoryTypeId = territoryTypeId;

src/world/Actor/GameObject.h

@@ -32,8 +32,6 @@ namespace Sapphire::Entity
     uint32_t m_territoryTypeId{};
     /*! Specific GUId of the zone the actor currently is in */
     uint32_t m_territoryId{};
-    /*! Ptr to the ZoneObj the actor belongs to */
-    TerritoryPtr m_pCurrentTerritory;
 
     /*! list of various actors in range */
     std::set< GameObjectPtr > m_inRangeActor;
@@ -123,16 +121,12 @@ namespace Sapphire::Entity
 
     BNpcPtr getAsBNpc();
 
-    TerritoryPtr getCurrentTerritory() const;
-
     uint32_t getTerritoryTypeId() const;
     void setTerritoryTypeId( uint32_t territoryTypeId );
 
     uint32_t getTerritoryId() const;
     void setTerritoryId( uint32_t territoryTypeId );
 
-    void setCurrentZone( TerritoryPtr currZone );
-
     // get the current cell of a region the actor is in
     Common::CellId getCellId() const;
     // set the current cell

src/world/Actor/Player.cpp

@@ -82,7 +82,8 @@ Sapphire::Entity::Player::Player() :
   m_pQueuedAction( nullptr ),
   m_partyId( 0 ),
   m_onlineStatusCustom( 0 ),
-  m_onlineStatus( 0 )
+  m_onlineStatus( 0 ),
+  m_bIsConnected( false )
 {
   m_id = 0;
   m_currentStance = Stance::Passive;
@@ -123,10 +124,9 @@ void Sapphire::Entity::Player::unload()
 {
   // do one last update to db
   updateSql();
-  // reset the zone, so the zone handler knows to remove the actor
-  setCurrentZone( nullptr );
   // reset isLogin and loading sequences just in case
   setIsLogin( false );
+  setConnected( false );
   setLoadingComplete( false );
   // unset player for removal
   setMarkedForRemoval( false );
@@ -2230,3 +2230,13 @@ std::optional< Sapphire::World::Quest > Sapphire::Entity::Player::getQuest( uint
   auto quest = getQuestByIndex( idx );
   return { quest };
 }
+
+bool Sapphire::Entity::Player::isConnected() const
+{
+  return m_bIsConnected;
+}
+
+void Sapphire::Entity::Player::setConnected( bool isConnected )
+{
+  m_bIsConnected = isConnected;
+}

src/world/Actor/Player.h

@@ -823,6 +823,9 @@ namespace Sapphire::Entity
     const Common::FFXIVARR_POSITION3& getPrevPos() const;
     float getPrevRot() const;
 
+    bool isConnected() const;
+    void setConnected( bool isConnected );
+
   private:
     /*! queue a packet for the player */
     void queuePacket( Network::Packets::FFXIVPacketBasePtr pPacket );
@@ -923,6 +926,8 @@ namespace Sapphire::Entity
     bool m_bLoadingComplete;
     bool m_bAutoattack;
 
+    bool m_bIsConnected;
+
     Common::ZoneingType m_zoningType;
 
     bool m_bMarkedForZoning;

src/world/Manager/TerritoryMgr.cpp

@@ -679,7 +679,6 @@ bool Sapphire::World::Manager::TerritoryMgr::movePlayer( const TerritoryPtr& pZo
   if( playerLoaded && pPrevZone )
     pPrevZone->removeActor( player.getAsPlayer() );
 
-  player.setCurrentZone( pZone );
   pZone->pushActor( player.getAsPlayer() );
 
   // map player to instanceId so it can be tracked.

src/world/Network/Handlers/PacketHandlers.cpp

@@ -409,6 +409,7 @@ void Sapphire::Network::GameConnection::loginHandler( const Packets::FFXIVARR_PA
   auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref();
   // init handler means this is a login procedure
   player.setIsLogin( true );
+  player.setConnected( true );
   teriMgr.joinWorld( player );
 }
 

src/world/Territory/HousingZone.cpp

@@ -294,7 +294,6 @@ Sapphire::Entity::EventObjectPtr Sapphire::HousingZone::registerEstateEntranceEO
   auto eObj = Entity::make_EventObject( getNextEObjId(), 2002737, 0, 4, land->getMapMarkerPosition(), 0.f, "entrance" );
   eObj->setHousingLink( landId << 8 );
   eObj->setScale( 1.f );
-  eObj->setCurrentZone( shared_from_this() );
 
   registerEObj( eObj );
 

src/world/Territory/Territory.cpp

@@ -808,7 +808,6 @@ Sapphire::Entity::EventObjectPtr Sapphire::Territory::registerEObj( const std::s
 {
   auto eObj = Entity::make_EventObject( getNextEObjId(), objectId, mapLink, state, pos, rotation, name );
   eObj->setScale( scale );
-  eObj->setCurrentZone( shared_from_this() );
 
   registerEObj( eObj );
 

src/world/WorldServer.cpp

@@ -318,7 +318,7 @@ void Sapphire::World::WorldServer::mainLoop()
 
         // if the player is in a zone, let the zone handler take care of his updates
         // else do it here.
-        if( !session->getPlayer()->getCurrentTerritory() )
+        if( !session->getPlayer()->isConnected() )
           session->update();
 
       }