mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Code Activity

Disabled betweenarea state flags until we fix it

Browse source
This commit is contained in:
Mordred 2018-02-04 18:53:19 +01:00
parent 48c4f681f1
commit 21a39a09eb
4 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -356,6 +356,17 @@ void Core::Entity::Player::returnToHomepoint()
void Core::Entity::Player::setZone( uint32_t zoneId ) void Core::Entity::Player::setZone( uint32_t zoneId )
{ {
if( !g_territoryMgr.movePlayer( zoneId, getAsPlayer() ) )
{
// todo: this will require proper handling, for now just return the player to their previous area
m_pos = m_prevPos;
m_rot = m_prevRot;
m_zoneId = m_prevZoneId;
if( !g_territoryMgr.movePlayer( m_zoneId, getAsPlayer() ) )
return;
}
sendZonePackets(); sendZonePackets();
} }
@ -1570,8 +1581,8 @@ void Player::sendZonePackets()
} }
// set flags, will be reset automatically by zoning ( only on client side though ) // set flags, will be reset automatically by zoning ( only on client side though )
setStateFlag( PlayerStateFlag::BetweenAreas ); //setStateFlag( PlayerStateFlag::BetweenAreas );
setStateFlag( PlayerStateFlag::BetweenAreas1 ); //setStateFlag( PlayerStateFlag::BetweenAreas1 );
sendStats(); sendStats();

2
src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
View file

@ -373,7 +373,7 @@ void Core::Network::GameConnection::initHandler( const Packets::GamePacket& inPa
// init handler means this is a login procedure // init handler means this is a login procedure
player.setIsLogin( true ); player.setIsLogin( true );
player.setZone( player.getZoneId() ); player.sendZonePackets();
} }

4
src/servers/sapphire_zone/Zone/InstanceContent.h
View file

@ -25,13 +25,13 @@ public:
uint32_t instanceContentId ); uint32_t instanceContentId );
virtual ~InstanceContent(); virtual ~InstanceContent();
boost::shared_ptr< Core::Data::InstanceContent > getInstanceContentInfo() const; Core::Data::ExdDataGenerated::InstanceContentPtr getInstanceContentInfo() const;
uint32_t getInstanceContentId() const; uint32_t getInstanceContentId() const;
private: private:
Event::DirectorPtr m_pDirector; Event::DirectorPtr m_pDirector;
boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo; Core::Data::ExdDataGenerated::InstanceContentPtr m_instanceContentInfo;
uint32_t m_instanceContentId; uint32_t m_instanceContentId;
InstanceContentState m_state; InstanceContentState m_state;