Fix objscale_master build after upstream master merge#181
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
…ry/__except with ReadProcessMemory
…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)
9d41063 to
9b651d0
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
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/TrinityCoremasterintoobjscale_masterand builds with-DWITH_WARNINGS_AS_ERRORS=1. The branch was failing at the merge step (spawn SQL conflicts) and would not compile after upstream schema/API changes.This PR merges the latest upstream
masterintoobjscale_master, resolves the conflicts, and keeps per-spawn scale persistence working.What was wrong
Merge conflicts
WorldDatabase.cpp— Upstream expandedWORLD_INS_CREATURE/WORLD_INS_GAMEOBJECTwithphaseUseFlags,terrainSwapMap,ScriptName, andStringId. Objscale adds a per-spawnsizecolumn to both INSERT statements.Creature.cpp::SaveToDB— Upstream appendedScriptName/StringIdSQL binds after unit flags. Objscale appendsdata.sizeat the end of the same statement.GameObject.cpp::SaveToDB— Same overlap between objscale'sdata.sizebind and upstream'sScriptName/StringIdbinds.Post-merge compile errors (
WITH_WARNINGS_AS_ERRORS=1)cs_gobject.cpp::HandleGameObjectSetScaleCommand— PassedGameObjectSpawnIdthroughstd::to_string(...).c_str()forLANG_COMMAND_OBJNOTFOUNDinstead of dereferencing like other call sites; success message passedstd::stringto a%splaceholder without.c_str().What was fixed
src/server/database/Database/Implementation/WorldDatabase.cppsizein both INSERT templates.src/server/game/Entities/Creature/Creature.cppdata.size, then upstreamScriptName/StringId.src/server/game/Entities/GameObject/GameObject.cppsrc/server/scripts/Commands/cs_gobject.cppLANG_COMMAND_OBJNOTFOUND, *guidLow;.ToString().c_str()for the success%s.Test plan
objscale_master.mergeworkflow_master (objscale_master, …)jobs pass..npc scale 2.0on a creature — verify scale and DB persistence..gobject set scale <id> 2.0— verify scale, persistence, and visibility refresh.<= 0restores template scale.