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

fix mount action interrupt

Browse source
This commit is contained in:
collett 2021-07-06 06:49:37 +09:00
parent f495e61a86
commit 399bb02abf
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -266,7 +266,6 @@ bool Action::Action::update()
if( isInterrupted() ) if( isInterrupted() )
{ {
interrupt();
return true; return true;
} }

2
src/world/Action/MountAction.cpp
View file

@ -57,6 +57,8 @@ void MountAction::start()
auto actionStartPkt = makeActorControlSelf( m_pSource->getId(), ActorControlType::ActionStart, 1, getId(), m_recastTimeMs / 10 ); auto actionStartPkt = makeActorControlSelf( m_pSource->getId(), ActorControlType::ActionStart, 1, getId(), m_recastTimeMs / 10 );
player->queuePacket( actionStartPkt ); player->queuePacket( actionStartPkt );
m_started = true;
} }
void MountAction::execute() void MountAction::execute()

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

@ -473,7 +473,7 @@ Sapphire::World::Action::ActionPtr Sapphire::Entity::Chara::getCurrentAction() c
/*! \param ActionPtr of the action to be registered */ /*! \param ActionPtr of the action to be registered */
void Sapphire::Entity::Chara::setCurrentAction( Sapphire::World::Action::ActionPtr pAction ) void Sapphire::Entity::Chara::setCurrentAction( Sapphire::World::Action::ActionPtr pAction )
{ {
m_pCurrentAction = std::move( pAction ); m_pCurrentAction = pAction;
} }
uint32_t Sapphire::Entity::Chara::getBonusStat( Common::BaseParam bonus ) const uint32_t Sapphire::Entity::Chara::getBonusStat( Common::BaseParam bonus ) const

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

@ -2269,7 +2269,7 @@ bool Sapphire::Entity::Player::hasQueuedAction() const
void Sapphire::Entity::Player::setQueuedAction( Sapphire::World::Action::ActionPtr pAction ) void Sapphire::Entity::Player::setQueuedAction( Sapphire::World::Action::ActionPtr pAction )
{ {
m_pQueuedAction = std::move( pAction ); // overwrite previous queued action if any m_pQueuedAction = pAction;
} }
bool Sapphire::Entity::Player::checkAction() bool Sapphire::Entity::Player::checkAction()