Skip to content

Conversation

@kelno
Copy link
Contributor

@kelno kelno commented Jan 13, 2020

Changes proposed:

  • Small tweak to allow combat timer to be refreshed in PvP.

Target branch(es):

  • 3.3.5

Issues addressed:
Closes #22851

Tests performed: (Does it build, tested in-game, etc.)
Code running on sunstrider core for about a year. (sunstrider being basically TC for TBC at this point).

Known issues and TODO list:

/

@kelno
Copy link
Contributor Author

kelno commented Jan 13, 2020

PvP combat needs other reworks as well, the combat manager is always working on the hypothesis that combat is always mutual, which is actually untrue in PvP. Example: If your target drop combat by vanishing it shouldn't affect your own combat state. A lot of more serious cases are affected by this but this one is easier to explain.

@jackpoz
Copy link
Member

jackpoz commented Jan 13, 2020

@Treeston please take a look at this when you have time

@jackpoz
Copy link
Member

jackpoz commented Jan 13, 2020

@kelno: actually you missed some code from SunstriderEmu/BugTracker@06d99c5

@jackpoz
Copy link
Member

jackpoz commented Jan 13, 2020

I applied the feedback provided by Treeston

@Killyana
Copy link
Contributor

Tested and works fine.

@jackpoz jackpoz merged commit 2b024e8 into TrinityCore:3.3.5 Jan 14, 2020
@jackpoz
Copy link
Member

jackpoz commented Jan 14, 2020

Thanks for the PR :)

Ovahlord referenced this pull request in The-Cataclysm-Preservation-Project/TrinityCore Jul 22, 2020
* Fixed PvP Combat timer never gets refreshed while meleeing

* Apply Treeston feedback

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
Shauren pushed a commit that referenced this pull request Dec 21, 2021
* Fixed PvP Combat timer never gets refreshed while meleeing

* Apply Treeston feedback

Co-authored-by: Giacomo Pozzoni <giacomopoz@gmail.com>
(cherry picked from commit 2b024e8)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants