diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp index 00a9c840..1cddcf49 100644 --- a/src/servers/sapphire_zone/Actor/Player.cpp +++ b/src/servers/sapphire_zone/Actor/Player.cpp @@ -1633,5 +1633,7 @@ void Player::sendZonePackets() if( getLastPing() == 0 ) sendQuestInfo(); + getCurrentZone()->onEnterTerritory( getAsPlayer() ); + m_bMarkedForZoning = false; } diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp index 72e66d9c..249af19f 100644 --- a/src/servers/sapphire_zone/Zone/Zone.cpp +++ b/src/servers/sapphire_zone/Zone/Zone.cpp @@ -311,9 +311,6 @@ void Zone::pushActor( Entity::ActorPtr pActor ) m_sessionSet.insert( pSession ); m_playerMap[pPlayer->getId()] = pPlayer; updateCellActivity( cx, cy, 2 ); - - onEnterTerritory( pPlayer ); - } else if( pActor->isBNpc() ) {