mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 16:37:45 +00:00
Code Activity

Fix for online status and minor cleanup

Browse source
This commit is contained in:
Mordred 2023-03-02 07:38:14 +01:00
parent ffdbed72ce
commit fe471fb4f1
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/world/Action/Action.cpp
View file

@ -153,12 +153,12 @@ bool Action::Action::init()
return true; return true;
} }
void Action::Action::setPos( const Sapphire::Common::FFXIVARR_POSITION3& pos ) void Action::Action::setPos( const Common::FFXIVARR_POSITION3& pos )
{ {
m_pos = pos; m_pos = pos;
} }
const Sapphire::Common::FFXIVARR_POSITION3& Action::Action::getPos() const const Common::FFXIVARR_POSITION3& Action::Action::getPos() const
{ {
return m_pos; return m_pos;
} }
@ -218,7 +218,7 @@ bool Action::Action::isWeaponskill() const
return m_category == ActionCategory::Weaponskill; return m_category == ActionCategory::Weaponskill;
} }
Sapphire::Entity::CharaPtr Action::Action::getSourceChara() const Entity::CharaPtr Action::Action::getSourceChara() const
{ {
return m_pSource; return m_pSource;
} }
@ -319,7 +319,7 @@ void Action::Action::start()
if( player ) if( player )
{ {
player->setCondition( PlayerCondition::Casting ); player->setCondition( PlayerCondition::Casting );
Service< World::Manager::PlayerMgr >::ref().onConditionChanged( *player, true ); playerMgr().onConditionChanged( *player, true );
} }
} }
@ -373,7 +373,7 @@ void Action::Action::interrupt()
// reset state flag // reset state flag
//player->unsetStateFlag( PlayerStateFlag::Occupied1 ); //player->unsetStateFlag( PlayerStateFlag::Occupied1 );
pPlayer->setLastActionTick( 0 ); pPlayer->setLastActionTick( 0 );
Service< World::Manager::PlayerMgr >::ref().removeCondition( *pPlayer, PlayerCondition::Casting ); playerMgr().removeCondition( *pPlayer, PlayerCondition::Casting );
} }
if( hasCastTime() ) if( hasCastTime() )
@ -384,8 +384,7 @@ void Action::Action::interrupt()
// Note: When cast interrupt from taking too much damage, set the last value to 1. // Note: When cast interrupt from taking too much damage, set the last value to 1.
// This enables the cast interrupt effect. // This enables the cast interrupt effect.
auto control = makeActorControl( m_pSource->getId(), ActorControlType::CastInterrupt, auto control = makeActorControl( m_pSource->getId(), ActorControlType::CastInterrupt, 0x219, 1, m_id, interruptEffect );
0x219, 1, m_id, interruptEffect );
server().queueForPlayers( m_pSource->getInRangePlayerIds( true ), control ); server().queueForPlayers( m_pSource->getInRangePlayerIds( true ), control );
} }
@ -420,7 +419,7 @@ void Action::Action::execute()
if( auto pPlayer = m_pSource->getAsPlayer(); pPlayer ) if( auto pPlayer = m_pSource->getAsPlayer(); pPlayer )
{ {
pPlayer->setLastActionTick( 0 ); pPlayer->setLastActionTick( 0 );
Service< World::Manager::PlayerMgr >::ref().removeCondition( *pPlayer, PlayerCondition::Casting ); playerMgr().removeCondition( *pPlayer, PlayerCondition::Casting );
} }
} }
@ -518,7 +517,7 @@ void Action::Action::buildEffects()
return; return;
} }
Service< World::Manager::PlayerMgr >::ref().onHudParamChanged( *m_pSource->getAsPlayer() ); playerMgr().onHudParamChanged( *m_pSource->getAsPlayer() );
if( !hasLutEntry || m_hitActors.empty() ) if( !hasLutEntry || m_hitActors.empty() )
{ {
@ -821,7 +820,7 @@ void Action::Action::addDefaultActorFilters()
} }
} }
bool Action::Action::preFilterActor( Sapphire::Entity::GameObject& actor ) const bool Action::Action::preFilterActor( Entity::GameObject& actor ) const
{ {
auto kind = actor.getObjKind(); auto kind = actor.getObjKind();
auto chara = actor.getAsChara(); auto chara = actor.getAsChara();
@ -846,12 +845,12 @@ bool Action::Action::preFilterActor( Sapphire::Entity::GameObject& actor ) const
return true; return true;
} }
std::vector< Sapphire::Entity::CharaPtr >& Action::Action::getHitCharas() std::vector< Entity::CharaPtr >& Action::Action::getHitCharas()
{ {
return m_hitActors; return m_hitActors;
} }
Sapphire::Entity::CharaPtr Action::Action::getHitChara() Entity::CharaPtr Action::Action::getHitChara()
{ {
if( !m_hitActors.empty() ) if( !m_hitActors.empty() )
{ {

3
src/world/Actor/Player.cpp
View file

@ -203,7 +203,8 @@ Common::OnlineStatus Player::getOnlineStatus() const
auto& exdData = Common::Service< Data::ExdData >::ref(); auto& exdData = Common::Service< Data::ExdData >::ref();
uint32_t statusDisplayOrder = 0xFF14; uint32_t statusDisplayOrder = 0xFF14;
auto applicableStatus = static_cast< uint32_t >( OnlineStatus::Online ); auto applicableStatus = isConnected() ? static_cast< uint32_t >( OnlineStatus::Online ) : static_cast< uint32_t >( OnlineStatus::Offline );
for( uint32_t i = 0; i < std::numeric_limits< decltype( m_onlineStatus ) >::digits; ++i ) for( uint32_t i = 0; i < std::numeric_limits< decltype( m_onlineStatus ) >::digits; ++i )
{ {