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

Fixed bnpc movement

Browse source
This commit is contained in:
Mordred 2019-01-20 23:49:43 +01:00
parent a8101844d5
commit 813ad98c5f
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,6 +73,7 @@ Sapphire::Entity::BNpc::BNpc( uint32_t id, BNpcTemplatePtr pTemplate, float posX
m_mp = 200; m_mp = 200;
m_state = BNpcState::Idle; m_state = BNpcState::Idle;
m_status = ActorStatus::Idle;
m_baseStats.max_hp = maxHp; m_baseStats.max_hp = maxHp;
m_baseStats.max_mp = 200; m_baseStats.max_mp = 200;
@ -128,7 +129,7 @@ uint32_t Sapphire::Entity::BNpc::getBNpcNameId() const
void Sapphire::Entity::BNpc::spawn( PlayerPtr pTarget ) void Sapphire::Entity::BNpc::spawn( PlayerPtr pTarget )
{ {
pTarget->queuePacket( std::make_shared< NpcSpawnPacket >( *getAsBNpc(), *pTarget ) ); pTarget->queuePacket( std::make_shared< NpcSpawnPacket >( *this, *pTarget ) );
} }
void Sapphire::Entity::BNpc::despawn( PlayerPtr pTarget ) void Sapphire::Entity::BNpc::despawn( PlayerPtr pTarget )
@ -166,7 +167,6 @@ bool Sapphire::Entity::BNpc::moveTo( const FFXIVARR_POSITION3& pos )
setPos( newPos ); setPos( newPos );
Common::FFXIVARR_POSITION3 tmpPos{ getPos().x + x, y, getPos().z + z }; Common::FFXIVARR_POSITION3 tmpPos{ getPos().x + x, y, getPos().z + z };
setPos( tmpPos ); setPos( tmpPos );
setRot( newRot ); setRot( newRot );

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

@ -244,7 +244,7 @@ bool Sapphire::Entity::Chara::face( const Common::FFXIVARR_POSITION3& p )
setRot( newRot ); setRot( newRot );
return oldRot != newRot ? true : false; return oldRot != newRot;
} }
/*! /*!

2
src/world/Network/PacketWrappers/NpcSpawnPacket.h
View file

@ -39,7 +39,6 @@ namespace Sapphire::Network::Packets::Server
m_data.mPMax = bnpc.getMaxMp(); m_data.mPMax = bnpc.getMaxMp();
m_data.subtype = 5; m_data.subtype = 5;
//m_data.tPMax = 3000;
m_data.level = bnpc.getLevel(); m_data.level = bnpc.getLevel();
m_data.pose = bnpc.getPose(); m_data.pose = bnpc.getPose();
@ -73,7 +72,6 @@ namespace Sapphire::Network::Packets::Server
if( !target.isActorSpawnIdValid( m_data.spawnIndex ) ) if( !target.isActorSpawnIdValid( m_data.spawnIndex ) )
return; return;
// 0x20 == spawn hidden to be displayed by the spawneffect control // 0x20 == spawn hidden to be displayed by the spawneffect control
//m_data.displayFlags = bnpc.getDisplayFlags(); //m_data.displayFlags = bnpc.getDisplayFlags();