Fix dressnpcs_master build after upstream master merge#179
Merged
Rochet2 merged 1737 commits intoMay 26, 2026
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
…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/dressnpcs_master-upstream-merge
branch
from
c4247a5 to
92f7076
Compare
…hanges Replace removed DB2Manager::GetItemDisplayId with TransmogMgr lookup and update dressed-NPC mirror image packet to use ChrModelID.
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/TrinityCoremasterintodressnpcs_masterand builds with-DWITH_WARNINGS_AS_ERRORS=1. The branch was failing at the merge step (multiple conflicts) and would not compile cleanly once upstream changes were applied.This PR merges the latest upstream
masterintodressnpcs_master, resolves the conflicts, and keeps DressNPCs behavior working with current TrinityCore APIs.What was wrong
Merge conflicts
cmake/options.cmake— DressNPCs adds theDISABLE_DRESSNPCS_CORESOUNDSCMake option; upstream reformatted the nearbyBUILD_TESTINGoption line.DB2Stores.h/DB2Stores.cpp— DressNPCs wrapsCreatureDisplayInfolookups to remap fake outfit display IDs viaObjectMgr::GetRealDisplayId(). Upstream addedCraftingQuality.db2and switched back to a plainDB2Storage<CreatureDisplayInfoEntry>.Creature.cpp— DressNPCs needsCreatureOutfit.h; upstream reordered includes aroundDB2Stores.h/DatabaseEnv.h.ObjectMgr.cpp— DressNPCs outfit SQL parsing uses<sstream>; upstream added<limits>/<numeric>includes in the same block.QuestHandler.cpp— DressNPCs added#include "Map.h"for mirror-sound hooks; upstream added#include "Memory.h".MiscHandler.cpp::HandleCloseInteraction— DressNPCs plays a mirror sound when closing interaction with a dressed NPC. Upstream addedIsLaunchedByQuesthandling before resetting interaction data.Already-clean areas
Opcode handlers that DressNPCs hooks (
ItemHandler,NPCHandler,MiscHandler::HandleSetSelectionOpcode, etc.) had already auto-merged to upstream's typed packet handlers (packet.Unit,packet.Selection, …).What was fixed
cmake/options.cmakeDISABLE_DRESSNPCS_CORESOUNDSand upstreamBUILD_TESTINGoption.src/server/game/DataStores/DB2Stores.hsCreatureDisplayInfoStoreRawwrapper and upstreamsCraftingQualityStore.src/server/game/DataStores/DB2Stores.cppCraftingQuality+ rawCreatureDisplayInfo.src/server/game/Entities/Creature/Creature.cppCreatureOutfit.hwith upstream include order.src/server/game/Globals/ObjectMgr.cpp<sstream>for outfit customization parsing; dedupe<numeric>.src/server/game/Handlers/QuestHandler.cppMap.handMemory.h.src/server/game/Handlers/MiscHandler.cppLocal verification
Test plan
dressnpcs_master.mergeworkflow_master (dressnpcs_master, …)jobs pass.CreatureOutfit; list inventory, gossip hello, and close interaction — verify mirror sounds where enabled.