Null-check ActionResultBuilder

SapphireServer · Jun 20, 2024 · cc63ac1 · cc63ac1
1 parent 97e1772
commit cc63ac1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/src/scripts/action/war/ActionInnerBeast.cpp b/src/scripts/action/war/ActionInnerBeast.cpp
@@ -22,18 +22,19 @@ class ActionInnerBeast : public Sapphire::ScriptAPI::ActionScript
     auto pPlayer = action.getSourceChara()->getAsPlayer();
     auto pSource = action.getSourceChara();
     auto pTarget = action.getHitChara();
+    auto pActionBuilder = action.getActionResultBuilder();
 
-    if( !pPlayer )
+    if( !pPlayer || !pActionBuilder )
       return;
 
     if( auto status = pPlayer->getStatusEffectById( Defiance ); status )
       status->setModifier( Common::ParamModifier::DamageDealtPercent, 0 );
 
     auto dmg = action.calcDamage( Potency );
-    action.getActionResultBuilder()->damage( pSource, pTarget, dmg.first, dmg.second );
-    action.getActionResultBuilder()->heal( pTarget, pSource, dmg.first, Common::CalcResultType::TypeRecoverHp, Common::ActionResultFlag::EffectOnSource );
+    pActionBuilder->damage( pSource, pTarget, dmg.first, dmg.second );
+    pActionBuilder->heal( pTarget, pSource, dmg.first, Common::CalcResultType::TypeRecoverHp, Common::ActionResultFlag::EffectOnSource );
 
-    action.getActionResultBuilder()->applyStatusEffectSelf( InnerBeast, 15000, 0, { StatusModifier{ Common::ParamModifier::DamageTakenPercent, -20 } } );
+    pActionBuilder->applyStatusEffectSelf( InnerBeast, 15000, 0, { StatusModifier{ Common::ParamModifier::DamageTakenPercent, -20 } } );
 
     if( !pPlayer->hasStatusEffect( Unchained ) )
     {

diff --git a/src/scripts/action/war/ActionUnchained.cpp b/src/scripts/action/war/ActionUnchained.cpp
@@ -18,14 +18,15 @@ class ActionUnchained : public Sapphire::ScriptAPI::ActionScript
   void onExecute( Sapphire::World::Action::Action& action ) override
   {
     auto pPlayer = action.getSourceChara()->getAsPlayer();
+    auto pActionBuilder = action.getActionResultBuilder();
 
-    if( !pPlayer )
+    if( !pPlayer || !pActionBuilder )
       return;
 
     if( auto status = pPlayer->getStatusEffectById( Defiance ); status )
       status->setModifier( Common::ParamModifier::DamageDealtPercent, 0 );
 
-    action.getActionResultBuilder()->applyStatusEffectSelf( Unchained, 20000, 0 );
+    pActionBuilder->applyStatusEffectSelf( Unchained, 20000, 0 );
   }
 };
 

diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
@@ -611,6 +611,11 @@ void Action::Action::buildActionResults()
 
 void Action::Action::handleStatusEffects()
 {
+  auto pActionBuilder = getActionResultBuilder();
+
+  if( !pActionBuilder )
+    return;
+
   if( isComboAction() && !isCorrectCombo() )
     return;
 
@@ -619,7 +624,7 @@ void Action::Action::handleStatusEffects()
   {
     for( auto& status : m_lutEntry.statuses.caster )
     {
-      getActionResultBuilder()->applyStatusEffectSelf( status.id, status.duration, 0, status.modifiers, status.flag, true );
+      pActionBuilder->applyStatusEffectSelf( status.id, status.duration, 0, status.modifiers, status.flag, true );
     }
   }
 
@@ -630,7 +635,7 @@ void Action::Action::handleStatusEffects()
     {
       for( auto& status : m_lutEntry.statuses.target )
       {
-        getActionResultBuilder()->applyStatusEffect( actor, status.id, status.duration, 0, status.modifiers, status.flag, true );
+        pActionBuilder->applyStatusEffect( actor, status.id, status.duration, 0, status.modifiers, status.flag, true );
       }
 
       if( actor->getStatusEffectMap().size() > 0 )

diff --git a/src/world/Action/Job/Warrior.cpp b/src/world/Action/Job/Warrior.cpp
@@ -33,6 +33,11 @@ void Warrior::handleWrath( Entity::Player& player, Action& action )
   auto parry = 2;
   auto asChara = player.getAsChara();
 
+  auto pActionBuilder = action.getActionResultBuilder();
+
+  if( !pActionBuilder )
+    return;
+
   if( player.hasStatusEffect( Wrath ) )
   {
     player.replaceSingleStatusEffectById( Wrath );
@@ -59,7 +64,7 @@ void Warrior::handleWrath( Entity::Player& player, Action& action )
   }
 
   if( !player.hasStatusEffect( Infuriated ) )
-  {
-    action.getActionResultBuilder()->applyStatusEffectSelf( effectToApply, 30000, 0, { StatusModifier{ Common::ParamModifier::ParryPercent, parry } }, 0, false );
+  {    
+    pActionBuilder->applyStatusEffectSelf( effectToApply, 30000, 0, { StatusModifier{ Common::ParamModifier::ParryPercent, parry } }, 0, false );
   }
 }