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

player.forceZoneing expand

Browse source
This commit is contained in:
collett 2020-07-01 07:28:25 +09:00
parent d084e1e9d4
commit 34f7d29ecd
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/world/Actor/Player.cpp
View file

@ -409,10 +409,11 @@ void Sapphire::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
} }
void Sapphire::Entity::Player::forceZoneing( uint32_t zoneId ) void Sapphire::Entity::Player::forceZoneing( uint32_t zoneId, float x, float y, float z, float r, bool showZoneName )
{ {
m_queuedZoneing = std::make_shared< QueuedZoning >( zoneId, getPos(), Util::getTimeMs(), 0.f ); Common::FFXIVARR_POSITION3 pos { x, y, z };
//performZoning( zoneId, Common::ZoneingType::None, getPos() ); m_queuedZoneing = std::make_shared< QueuedZoning >( zoneId, pos, Util::getTimeMs(), r );
prepareZoning( showZoneName ? zoneId : 0, true, 1, 0 );
} }
void Sapphire::Entity::Player::returnToHomepoint() void Sapphire::Entity::Player::returnToHomepoint()

2
src/world/Actor/Player.h
View file

@ -501,7 +501,7 @@ namespace Sapphire::Entity
/*! gets the players territoryTypeId */ /*! gets the players territoryTypeId */
uint32_t getTerritoryTypeId() const; uint32_t getTerritoryTypeId() const;
void forceZoneing( uint32_t zoneId ); void forceZoneing( uint32_t zoneId, float x = 0, float y = 0, float z = 0, float r = 0, bool showZoneName = false );
/*! return player to preset homepoint */ /*! return player to preset homepoint */
void returnToHomepoint(); void returnToHomepoint();