From 12fd17e09c63c3666f94bb811311577481ca8c41 Mon Sep 17 00:00:00 2001 From: collett Date: Thu, 2 Jan 2020 01:52:20 +0900 Subject: [PATCH] Really fix sprint (and other scripted actions as well). --- src/world/Action/Action.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index cee3d464..4adc0aea 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -391,8 +391,9 @@ void Action::Action::buildEffects() snapshotAffectedActors( m_hitActors ); auto pScriptMgr = m_pFw->get< Scripting::ScriptMgr >(); + auto hasLutEntry = ActionLut::validEntryExists( getId() ); - if( !pScriptMgr->onExecute( *this ) && !ActionLut::validEntryExists( getId() ) ) + if( !pScriptMgr->onExecute( *this ) && !hasLutEntry ) { if( auto player = m_pSource->getAsPlayer() ) { @@ -402,10 +403,7 @@ void Action::Action::buildEffects() return; } - if (getId() == 3) // fix sprint for now - return; - - if( m_hitActors.empty() ) + if( !hasLutEntry || m_hitActors.empty() ) return; auto lutEntry = ActionLut::getEntry( getId() );