Skip to content

[Demon Hunter] Fix sigil expression crash when spell is not known #11177

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

Open
taherbert wants to merge 1 commit into
base: midnight
Choose a base branch
from
Open

[Demon Hunter] Fix sigil expression crash when spell is not known #11177

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
25 changes: 25 additions & 0 deletions engine/class_modules/sc_demon_hunter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4440,6 +4440,11 @@ struct sigil_of_flame_t : public demon_hunter_spell_t
if ( auto e = sigil->create_sigil_expression( name ) )
return e;
}
else if ( util::str_compare_ci( name, "placed" ) || util::str_compare_ci( name, "sigil_placed" ) ||
util::str_compare_ci( name, "activation_time" ) || util::str_compare_ci( name, "delay" ) )
{
return expr_t::create_constant( name, 0 );
}

return demon_hunter_spell_t::create_expression( name );
}
Expand Down Expand Up @@ -5379,6 +5384,11 @@ struct sigil_of_spite_t : public demon_hunter_spell_t
if ( auto e = sigil->create_sigil_expression( name ) )
return e;
}
else if ( util::str_compare_ci( name, "placed" ) || util::str_compare_ci( name, "sigil_placed" ) ||
util::str_compare_ci( name, "activation_time" ) || util::str_compare_ci( name, "delay" ) )
{
return expr_t::create_constant( name, 0 );
}

return demon_hunter_spell_t::create_expression( name );
}
Expand Down Expand Up @@ -5527,6 +5537,11 @@ struct sigil_of_misery_t : public demon_hunter_spell_t
if ( auto e = sigil->create_sigil_expression( name ) )
return e;
}
else if ( util::str_compare_ci( name, "placed" ) || util::str_compare_ci( name, "sigil_placed" ) ||
util::str_compare_ci( name, "activation_time" ) || util::str_compare_ci( name, "delay" ) )
{
return expr_t::create_constant( name, 0 );
}

return demon_hunter_spell_t::create_expression( name );
}
Expand Down Expand Up @@ -5573,6 +5588,11 @@ struct sigil_of_silence_t : public demon_hunter_spell_t
if ( auto e = sigil->create_sigil_expression( name ) )
return e;
}
else if ( util::str_compare_ci( name, "placed" ) || util::str_compare_ci( name, "sigil_placed" ) ||
util::str_compare_ci( name, "activation_time" ) || util::str_compare_ci( name, "delay" ) )
{
return expr_t::create_constant( name, 0 );
}

return demon_hunter_spell_t::create_expression( name );
}
Expand Down Expand Up @@ -5619,6 +5639,11 @@ struct sigil_of_chains_t : public demon_hunter_spell_t
if ( auto e = sigil->create_sigil_expression( name ) )
return e;
}
else if ( util::str_compare_ci( name, "placed" ) || util::str_compare_ci( name, "sigil_placed" ) ||
util::str_compare_ci( name, "activation_time" ) || util::str_compare_ci( name, "delay" ) )
{
return expr_t::create_constant( name, 0 );
}

return demon_hunter_spell_t::create_expression( name );
}
Expand Down
Loading