diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp index c60e2d78..e7b06de2 100644 --- a/src/servers/sapphire_zone/Actor/Player.cpp +++ b/src/servers/sapphire_zone/Actor/Player.cpp @@ -121,12 +121,12 @@ uint16_t Core::Entity::Player::getZoneId() const return m_zoneId; } -uint16_t Core::Entity::Player::getTerritoryId() const +uint32_t Core::Entity::Player::getTerritoryId() const { return m_territoryId; } -void Core::Entity::Player::setTerritoryId( uint16_t territoryId ) +void Core::Entity::Player::setTerritoryId( uint32_t territoryId ) { m_territoryId = territoryId; } @@ -1580,6 +1580,8 @@ void Core::Entity::Player::sendZonePackets() initZonePacket->data().pos.z = getPos().z; queuePacket( initZonePacket ); + getCurrentZone()->onPlayerZoneIn( *this ); + if( isLogin() ) { auto unk322 = makeZonePacket< FFXIVARR_IPC_UNK322 >( getId() ); @@ -1592,8 +1594,6 @@ void Core::Entity::Player::sendZonePackets() if( getLastPing() == 0 ) sendQuestInfo(); - getCurrentZone()->onPlayerZoneIn( *this ); - m_bMarkedForZoning = false; } diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h index 59b5bd1b..1bf9fe72 100644 --- a/src/servers/sapphire_zone/Actor/Player.h +++ b/src/servers/sapphire_zone/Actor/Player.h @@ -777,8 +777,8 @@ namespace Core::Entity uint16_t getZoneId() const; - uint16_t getTerritoryId() const; - void setTerritoryId( uint16_t territoryId ); + uint32_t getTerritoryId() const; + void setTerritoryId( uint32_t territoryId ); uint8_t getGmRank() const; @@ -1001,7 +1001,7 @@ namespace Core::Entity bool m_bAutoattack; Common::ZoneingType m_zoningType; - uint16_t m_territoryId; + uint32_t m_territoryId; bool m_bMarkedForZoning; bool m_bNewAdventurer;