Skip to content

Commit cff3dd7

Browse files
committed
[ele] fix pf again
1 parent d82ba6c commit cff3dd7

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

engine/class_modules/sc_shaman.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2663,6 +2663,11 @@ struct shaman_action_t : public parse_action_effects_t<Base>
26632663
return;
26642664
}
26652665

2666+
if (!state)
2667+
{
2668+
return;
2669+
}
2670+
26662671
double g = maelstrom_gain;
26672672
g *= composite_maelstrom_gain_coefficient( state );
26682673

@@ -3100,7 +3105,7 @@ struct shaman_spell_base_t : public shaman_action_t<Base>
31003105
this->p()->proc.aftershock->occur();
31013106
}
31023107

3103-
if ( ( this->execute_state->action->id == 188389 ) ||
3108+
if ( ( this->execute_state && this->execute_state->action->id == 188389 ) ||
31043109
( this->is_variant( spell_variant::NORMAL ) && !this->background) )
31053110
{
31063111
this->p()->trigger_ancestor( ancestor_trigger, this->execute_state );
@@ -6927,8 +6932,7 @@ struct lava_burst_t : public shaman_spell_t
69276932
size_t available_targets( std::vector<player_t*>& tl ) const override
69286933
{
69296934
shaman_spell_t::available_targets( tl );
6930-
6931-
p()->regenerate_flame_shock_dependent_target_list( this );
6935+
p()->regenerate_flame_shock_dependent_target_list( this, is_variant( spell_variant::PURGING_FLAMES ));
69326936

69336937
return tl.size();
69346938
}
@@ -7045,12 +7049,9 @@ struct lava_burst_t : public shaman_spell_t
70457049

70467050
if (p()->buff.purging_flames->check() && !background)
70477051
{
7048-
p()->regenerate_flame_shock_dependent_target_list( this, true );
70497052
assert( p()->action.lava_burst_pf );
70507053
p()->action.lava_burst_pf->execute();
70517054
p()->buff.purging_flames->decrement();
7052-
7053-
this->target_cache.is_valid = false;
70547055
}
70557056

70567057
// [BUG] 2024-08-23 Supercharge works on Lava Burst in-game

0 commit comments

Comments
 (0)