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

cleanup spawn slot handling for bnpcs

Browse source
This commit is contained in:
NotAdam 2019-01-19 19:28:12 +11:00
parent 603604b28d
commit 9712f94d00
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -76,17 +76,14 @@ namespace Sapphire::Network::Packets::Server
m_data.bNPCName = bnpc.getBNpcNameId(); m_data.bNPCName = bnpc.getBNpcNameId();
m_data.state = 1; m_data.state = 1;
if( target.getId() == bnpc.getId() )
{
m_data.spawnIndex = 0x00;
}
else
{
m_data.spawnIndex = target.getSpawnIdForActorId( bnpc.getId() );
if( !target.isActorSpawnIdValid( m_data.spawnIndex ) ) assert( target.getId() != bnpc.getId() );
return;
} m_data.spawnIndex = target.getSpawnIdForActorId( bnpc.getId() );
if( !target.isActorSpawnIdValid( m_data.spawnIndex ) )
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();