Skip to content

[paladin] Fix simulator getting stuck when using channeled trinkets too early. #11787

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
renanthera wants to merge 1 commit into
base: midnight
Choose a base branch
from
+4 −3
Open

[paladin] Fix simulator getting stuck when using channeled trinkets too early. #11787

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
7 changes: 4 additions & 3 deletions engine/class_modules/paladin/sc_paladin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,10 +972,11 @@ struct melee_t : public paladin_melee_attack_t
{
if ( !player->in_combat )
return 10_ms;
if ( first )

if ( first && !player->channeling )
return 0_ms;
else
return paladin_melee_attack_t::execute_time();

return paladin_melee_attack_t::execute_time();
}

void execute() override
Expand Down
Loading