From 38661033facfd1fcf24758e84690eac02e80ab5a Mon Sep 17 00:00:00 2001
From: goaaats <fakecake@icloud.com>
Date: Thu, 8 Feb 2018 15:25:59 +0100
Subject: [PATCH] Handle via inRangeSet

---
 src/servers/sapphire_zone/Actor/Actor.cpp  | 3 ---
 src/servers/sapphire_zone/Actor/Player.cpp | 3 ---
 src/servers/sapphire_zone/Zone/Zone.cpp    | 3 +++
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 227657cf..a87e9c9b 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -512,9 +512,6 @@ void Core::Entity::Actor::sendToInRangeSet( Network::Packets::GamePacketPtr pPac
          pSession->getZoneConnection()->queueOutPacket( pPacket );
    }
 
-   if( g_territoryMgr.isPrivateTerritory( getCurrentZone()->getTerritoryId() ) )
-      return;
-
    if( m_inRangePlayers.empty() )
       return;
 
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index ca71b217..058623f0 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -825,9 +825,6 @@ void Core::Entity::Player::setLookAt( uint8_t index, uint8_t value )
 // spawn this player for pTarget
 void Core::Entity::Player::spawn( Entity::PlayerPtr pTarget )
 {
-   if( g_territoryMgr.isPrivateTerritory( getCurrentZone()->getTerritoryId() ) && pTarget->getId() != getId() )
-      return;
-
    g_log.debug( "[" + std::to_string( pTarget->getId() ) + "] Spawning " +
                 getName() + " for " +
                 pTarget->getName() );
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 45868d8e..ce9afa56 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -725,6 +725,9 @@ void Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
    if( pCell == nullptr )
       return;
 
+   if( g_territoryMgr.isPrivateTerritory( getTerritoryId() ) )
+      return;
+
    Entity::ActorPtr pCurAct;
 
    auto iter = pCell->m_actors.begin();