mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-29 07:37:45 +00:00
Code Activity

Field size fix

Browse source
This commit is contained in:
mordred 2018-11-06 13:05:39 +01:00
parent 4f296b0fb3
commit fa80e53bd4
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/servers/sapphire_zone/Actor/Player.cpp
View file

@ -121,12 +121,12 @@ uint16_t Core::Entity::Player::getZoneId() const
return m_zoneId; return m_zoneId;
} }
uint16_t Core::Entity::Player::getTerritoryId() const uint32_t Core::Entity::Player::getTerritoryId() const
{ {
return m_territoryId; return m_territoryId;
} }
void Core::Entity::Player::setTerritoryId( uint16_t territoryId ) void Core::Entity::Player::setTerritoryId( uint32_t territoryId )
{ {
m_territoryId = territoryId; m_territoryId = territoryId;
} }
@ -1580,6 +1580,8 @@ void Core::Entity::Player::sendZonePackets()
initZonePacket->data().pos.z = getPos().z; initZonePacket->data().pos.z = getPos().z;
queuePacket( initZonePacket ); queuePacket( initZonePacket );
getCurrentZone()->onPlayerZoneIn( *this );
if( isLogin() ) if( isLogin() )
{ {
auto unk322 = makeZonePacket< FFXIVARR_IPC_UNK322 >( getId() ); auto unk322 = makeZonePacket< FFXIVARR_IPC_UNK322 >( getId() );
@ -1592,8 +1594,6 @@ void Core::Entity::Player::sendZonePackets()
if( getLastPing() == 0 ) if( getLastPing() == 0 )
sendQuestInfo(); sendQuestInfo();
getCurrentZone()->onPlayerZoneIn( *this );
m_bMarkedForZoning = false; m_bMarkedForZoning = false;
} }

6
src/servers/sapphire_zone/Actor/Player.h
View file

@ -777,8 +777,8 @@ namespace Core::Entity
uint16_t getZoneId() const; uint16_t getZoneId() const;
uint16_t getTerritoryId() const; uint32_t getTerritoryId() const;
void setTerritoryId( uint16_t territoryId ); void setTerritoryId( uint32_t territoryId );
uint8_t getGmRank() const; uint8_t getGmRank() const;
@ -1001,7 +1001,7 @@ namespace Core::Entity
bool m_bAutoattack; bool m_bAutoattack;
Common::ZoneingType m_zoningType; Common::ZoneingType m_zoningType;
uint16_t m_territoryId; uint32_t m_territoryId;
bool m_bMarkedForZoning; bool m_bMarkedForZoning;
bool m_bNewAdventurer; bool m_bNewAdventurer;