Skip to content

[ele] fix pf again #11292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HawkCorrigan merged 1 commit into from
Mar 26, 2026
+7 −6
Merged

[ele] fix pf again #11292

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions engine/class_modules/sc_shaman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2663,6 +2663,11 @@ struct shaman_action_t : public parse_action_effects_t<Base>
return;
}

if (!state)
{
return;
}

double g = maelstrom_gain;
g *= composite_maelstrom_gain_coefficient( state );

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

if ( ( this->execute_state->action->id == 188389 ) ||
if ( ( this->execute_state && this->execute_state->action->id == 188389 ) ||
( this->is_variant( spell_variant::NORMAL ) && !this->background) )
{
this->p()->trigger_ancestor( ancestor_trigger, this->execute_state );
Expand Down Expand Up @@ -6927,8 +6932,7 @@ struct lava_burst_t : public shaman_spell_t
size_t available_targets( std::vector<player_t*>& tl ) const override
{
shaman_spell_t::available_targets( tl );

p()->regenerate_flame_shock_dependent_target_list( this );
p()->regenerate_flame_shock_dependent_target_list( this, is_variant( spell_variant::PURGING_FLAMES ));

return tl.size();
}
Expand Down Expand Up @@ -7045,12 +7049,9 @@ struct lava_burst_t : public shaman_spell_t

if (p()->buff.purging_flames->check() && !background)
{
p()->regenerate_flame_shock_dependent_target_list( this, true );
assert( p()->action.lava_burst_pf );
p()->action.lava_burst_pf->execute();
p()->buff.purging_flames->decrement();

this->target_cache.is_valid = false;
}

// [BUG] 2024-08-23 Supercharge works on Lava Burst in-game
Expand Down
Loading