sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Druid): preserve shapeshift form across map changes (#25556)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-05-02 07:09:00 -05:00
committed by GitHub
parent e4aacc17bb
commit b6292f3509
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectMgr.cpp
+5 -2
View File
@@ -1895,7 +1895,10 @@ uint32 ObjectMgr::GetModelForShapeshift(ShapeshiftForm form, Player* player) con
else else
customizationID = player->GetByteValue(PLAYER_BYTES, 0); // Use Skin Color customizationID = player->GetByteValue(PLAYER_BYTES, 0); // Use Skin Color
auto itr = _playerShapeshiftModel.find(std::make_tuple(form, player->getRace(), customizationID, player->getGender())); // getGender() tracks the active display model; real gender lives in PLAYER_BYTES_3
uint8 gender = player->GetByteValue(PLAYER_BYTES_3, PLAYER_BYTES_3_OFFSET_GENDER);
auto itr = _playerShapeshiftModel.find(std::make_tuple(form, player->getRace(), customizationID, gender));
if (itr != _playerShapeshiftModel.end()) if (itr != _playerShapeshiftModel.end())
return itr->second; // Explicit combination return itr->second; // Explicit combination
@@ -1903,7 +1906,7 @@ uint32 ObjectMgr::GetModelForShapeshift(ShapeshiftForm form, Player* player) con
if (itr != _playerShapeshiftModel.end()) if (itr != _playerShapeshiftModel.end())
return itr->second; // Combination applied to both genders return itr->second; // Combination applied to both genders
itr = _playerShapeshiftModel.find(std::make_tuple(form, player->getRace(), 255, player->getGender())); itr = _playerShapeshiftModel.find(std::make_tuple(form, player->getRace(), 255, gender));
if (itr != _playerShapeshiftModel.end()) if (itr != _playerShapeshiftModel.end())
return itr->second; // Default gender-dependent model return itr->second; // Default gender-dependent model