mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-05 18:27:47 +00:00
Code Activity

Merge pull request #611 from collett8192/actionlut_fix

Browse source 
Fix non-existing lut entry being executed.
This commit is contained in:
Adam 2020-01-02 20:59:09 +11:00 • committed by GitHub
commit 885746c860
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,8 +391,9 @@ void Action::Action::buildEffects()
snapshotAffectedActors( m_hitActors ); snapshotAffectedActors( m_hitActors );
auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >(); auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >();
auto hasLutEntry = ActionLut::validEntryExists( static_cast< uint16_t >( getId() ) );
if( !pScriptMgr->onExecute( *this ) && !ActionLut::validEntryExists( static_cast< uint16_t >( getId() ) ) ) if( !pScriptMgr->onExecute( *this ) && !hasLutEntry )
{ {
if( auto player = m_pSource->getAsPlayer() ) if( auto player = m_pSource->getAsPlayer() )
{ {
@ -402,7 +403,7 @@ void Action::Action::buildEffects()
return; return;
} }
if( m_hitActors.empty() ) if( !hasLutEntry || m_hitActors.empty() )
return; return;
auto lutEntry = ActionLut::getEntry( static_cast< uint16_t >( getId() ) ); auto lutEntry = ActionLut::getEntry( static_cast< uint16_t >( getId() ) );