Fix playeritemgossip_master build after upstream master merge#182
Merged
Rochet2 merged 574 commits intoMay 26, 2026
Merged
Conversation
…AST now happens before FINISH as intended)
…dor in sell all junk packet handler
…wind (Fury Warrior Talent) (TrinityCore#31690)
… result of incorrect merge conflict resolution
…tain Thane warrior talent) (TrinityCore#31691)
… while still being teleported to a different map
…st hit of Rampage
…s in WorldPacket (cherry picked from commit b758b56)
…tly always printed before battleground starts and replaced its trinity_string entry with proper battleground status packet
…ssage printed to chat
… fadeObject argument
by jildor, closes TrinityCore#28854 (cherry picked from commit fe81161)
by CraftedRO closes TrinityCore#28840 (cherry picked from commit ebceb9e)
Rochet2
force-pushed
the
fix/playeritemgossip_master-upstream-merge
branch
from
54ae472 to
b38f378
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The scheduled
mergeworkflow mergesTrinityCore/TrinityCoremasterintoplayeritemgossip_masterand builds with-DWITH_WARNINGS_AS_ERRORS=1. The branch had fallen behind upstream and needed a fresh merge before CI could push again.This PR merges the latest upstream
masterintoplayeritemgossip_master. The merge applied cleanly — no conflict resolution or source fixes were required.What was wrong
playeritemgossip_masterwas no longer an ancestor of upstreammaster, so the automerge job would attempt another merge/build cycle. The feature branch's custom gossip script and slot accessor hooks remained compatible with current upstream after the merge.What was fixed
No manual code changes beyond the merge commit itself.
Test plan
playeritemgossip_master.mergeworkflow_master (playeritemgossip_master, …)jobs pass.