mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-28 15:17:46 +00:00
Code Activity

don't send position updates when pushing bnpcs

Browse source
This commit is contained in:
NotAdam 2019-02-01 00:04:19 +11:00
parent 8c9c98e896
commit c349142929
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/world/Actor/Actor.cpp
View file

@ -57,18 +57,22 @@ Sapphire::Common::FFXIVARR_POSITION3& Sapphire::Entity::Actor::getPos()
return m_pos; return m_pos;
} }
void Sapphire::Entity::Actor::setPos( float x, float y, float z ) void Sapphire::Entity::Actor::setPos( float x, float y, float z, bool broadcastUpdate )
{ {
m_pos.x = x; m_pos.x = x;
m_pos.y = y; m_pos.y = y;
m_pos.z = z; m_pos.z = z;
m_pCurrentZone->updateActorPosition( *this );
if( broadcastUpdate )
m_pCurrentZone->updateActorPosition( *this );
} }
void Sapphire::Entity::Actor::setPos( const Sapphire::Common::FFXIVARR_POSITION3& pos ) void Sapphire::Entity::Actor::setPos( const Sapphire::Common::FFXIVARR_POSITION3& pos, bool broadcastUpdate )
{ {
m_pos = pos; m_pos = pos;
m_pCurrentZone->updateActorPosition( *this );
if( broadcastUpdate )
m_pCurrentZone->updateActorPosition( *this );
} }
float Sapphire::Entity::Actor::getRot() const float Sapphire::Entity::Actor::getRot() const

4
src/world/Actor/Actor.h
View file

@ -59,9 +59,9 @@ namespace Sapphire::Entity
Common::FFXIVARR_POSITION3& getPos(); Common::FFXIVARR_POSITION3& getPos();
void setPos( const Common::FFXIVARR_POSITION3& pos ); void setPos( const Common::FFXIVARR_POSITION3& pos, bool broadcastUpdate = true );
void setPos( float x, float y, float z ); void setPos( float x, float y, float z, bool broadcastUpdate = true );
float getRot() const; float getRot() const;

2
src/world/Actor/BNpc.cpp
View file

@ -653,7 +653,7 @@ void Sapphire::Entity::BNpc::pushNearbyBNpcs()
bNpc->setPos( pos.x + ( x * factor * delta ), bNpc->setPos( pos.x + ( x * factor * delta ),
pos.y, pos.y,
pos.z + ( z * factor * delta ) ); pos.z + ( z * factor * delta ), false );
// setPos( m_pos.x + ( xBase * -pushDistance ), // setPos( m_pos.x + ( xBase * -pushDistance ),
// m_pos.y, // m_pos.y,