Skip to content
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

Jump to bottom

Core/Combat Fix first autoattack being skipped after charging #26860

Merged
merged 1 commit into from Aug 30, 2021
Merged

Core/Combat Fix first autoattack being skipped after charging #26860

merged 1 commit into from Aug 30, 2021

Conversation

trickerer
Copy link
Contributor

Changes proposed:

  • Check for UNIT_STATE_CHARGING so player's autoattack doesn't get silently cancelled in Unit::AttackerStateUpdate()

Target branch(es): 3.3.5/master

  • 3.3.5
  • master

Tests performed:

tested in-game

@Jinnaix
Copy link
Contributor

Jinnaix commented Aug 26, 2021

Should potentially fix #25014 & #24626.
Not sure about #17589

@Jinnaix
Copy link
Contributor

Jinnaix commented Aug 26, 2021

Tested in-game.
Works as intended. Does correct charge for Warriors and Druids.

Fixes:
#25014
#24626

@jackpoz jackpoz merged commit 8729bec into TrinityCore:3.3.5 Aug 30, 2021
@jackpoz
Copy link
Member

jackpoz commented Aug 30, 2021

Thanks for the PR 🚀 😃

@trickerer trickerer deleted the ChargeAttackFix branch September 8, 2021 09:32
Shauren pushed a commit that referenced this pull request Mar 13, 2022
@trickerer @Shauren
Core/Combat Fix first autoattack being skipped after charging (#26860)
c783ba3 
Fixes #25014
Fixes #24626

(cherry picked from commit 8729bec)
@AGandrup AGandrup mentioned this pull request Apr 1, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Branch-3.3.5a
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@trickerer @Jinnaix @jackpoz