mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-08 19:57:46 +00:00
Code Activity

fix possible null pointer access & eobj state update

Browse source
This commit is contained in:
Adam 2018-02-25 21:46:34 +11:00
parent c210b5ebef
commit 4137379853
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/servers/sapphire_zone/Actor/Actor.cpp
View file

@ -313,10 +313,13 @@ void Core::Entity::Actor::setCurrentZone( ZonePtr currZone )
m_pCurrentZone = currZone;
}
/*! \return InstanceContentPtr to the current instance, null if not an instance or not set */
/*! \return InstanceContentPtr to the current instance, nullptr if not an instance or not set */
Core::InstanceContentPtr Core::Entity::Actor::getCurrentInstance() const
{
return getCurrentZone()->getAsInstanceContent();
if( m_pCurrentZone )
return m_pCurrentZone->getAsInstanceContent();
return nullptr;
}
/*!

9
src/servers/sapphire_zone/Actor/EventObject.cpp
View file

@ -56,6 +56,15 @@ void Core::Entity::EventObject::setState( uint8_t state )
{
m_state = state;
for( const auto& player : m_inRangePlayers )
{
ZoneChannelPacket< FFXIVIpcActorControl142 > eobjUpdatePacket( getId(), player->getId() );
eobjUpdatePacket.data().category = Common::ActorControlType::DirectorEObjMod;
eobjUpdatePacket.data().param1 = state;
player->queuePacket( eobjUpdatePacket );
}
//m_parentInstance->updateEObj( InstanceObjectPtr( this ) );
}