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

Quest mobs will be highlighted as such. Retreating mobs will have the target properly reset. Spawning range slightly decreased

Browse source
This commit is contained in:
Mordred 2019-01-29 00:10:21 +01:00
parent 8db8a1d0e5
commit 14cbda944e
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/common/Common.h
View file

@ -18,6 +18,7 @@ namespace Sapphire::Common
const uint8_t MAX_DISPLAYED_EOBJS = 40; const uint8_t MAX_DISPLAYED_EOBJS = 40;
const int32_t INVALID_GAME_OBJECT_ID = 0xE0000000; const int32_t INVALID_GAME_OBJECT_ID = 0xE0000000;
const uint64_t INVALID_GAME_OBJECT_ID64 = 0xE0000000;
struct FFXIVARR_POSITION3 struct FFXIVARR_POSITION3
{ {

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

@ -489,7 +489,7 @@ void Sapphire::Entity::BNpc::update( int64_t currTime )
if( distanceOrig > maxDistanceToOrigin ) if( distanceOrig > maxDistanceToOrigin )
{ {
hateListClear(); hateListClear();
changeTarget( INVALID_GAME_OBJECT_ID ); changeTarget( INVALID_GAME_OBJECT_ID64 );
setStance( Stance::Passive ); setStance( Stance::Passive );
//setOwner( nullptr ); //setOwner( nullptr );
m_state = BNpcState::Retreat; m_state = BNpcState::Retreat;
@ -508,7 +508,7 @@ void Sapphire::Entity::BNpc::update( int64_t currTime )
} }
else else
{ {
changeTarget( INVALID_GAME_OBJECT_ID ); changeTarget( INVALID_GAME_OBJECT_ID64 );
setStance( Stance::Passive ); setStance( Stance::Passive );
//setOwner( nullptr ); //setOwner( nullptr );
m_state = BNpcState::Retreat; m_state = BNpcState::Retreat;

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

@ -58,7 +58,9 @@ namespace Sapphire::Network::Packets::Server
m_data.classJob = 0; m_data.classJob = 0;
m_data.targetId = Common::INVALID_GAME_OBJECT_ID; m_data.targetId = Common::INVALID_GAME_OBJECT_ID64;
m_data.spawnerId = Common::INVALID_GAME_OBJECT_ID64;
m_data.parentActorId = Common::INVALID_GAME_OBJECT_ID64;
//m_data.u23 = 0x04; //m_data.u23 = 0x04;
//m_data.u24 = 256; //m_data.u24 = 256;

2
src/world/ServerMgr.cpp
View file

@ -101,7 +101,7 @@ bool Sapphire::World::ServerMgr::loadSettings( int32_t argc, char* argv[] )
m_config.network.disconnectTimeout = pConfig->getValue< uint16_t >( "Network", "DisconnectTimeout", 20 ); m_config.network.disconnectTimeout = pConfig->getValue< uint16_t >( "Network", "DisconnectTimeout", 20 );
m_config.network.listenIp = pConfig->getValue< std::string >( "Network", "ListenIp", "0.0.0.0" ); m_config.network.listenIp = pConfig->getValue< std::string >( "Network", "ListenIp", "0.0.0.0" );
m_config.network.listenPort = pConfig->getValue< uint16_t >( "Network", "ListenPort", 54992 ); m_config.network.listenPort = pConfig->getValue< uint16_t >( "Network", "ListenPort", 54992 );
m_config.network.inRangeDistance = pConfig->getValue< float >( "Network", "InRangeDistance", 100.f ); m_config.network.inRangeDistance = pConfig->getValue< float >( "Network", "InRangeDistance", 80.f );
m_config.motd = pConfig->getValue< std::string >( "General", "MotD", "" ); m_config.motd = pConfig->getValue< std::string >( "General", "MotD", "" );