From 960fdd4deddecc8a1c45f02abfe9114a76ac2feb Mon Sep 17 00:00:00 2001 From: Roc13x Date: Wed, 11 Apr 2018 20:04:43 +0100 Subject: Core/Player: Fix equipment set GUID handling (#21646) Setting max GUID at server load was not taking transmog outfits into consideration. New equip sets were always stored in _equipmentSets[0], overwriting eachother --- src/server/game/Entities/Player/Player.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/server/game/Entities') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index ba55f9b85f6..a0117149937 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -26591,15 +26591,14 @@ void Player::SetEquipmentSet(EquipmentSetInfo::EquipmentSetData const& newEqSet) } } - EquipmentSetInfo& eqSlot = _equipmentSets[newEqSet.Guid]; - - EquipmentSetUpdateState oldState = eqSlot.State; + uint64 setGuid = (newEqSet.Guid != 0) ? newEqSet.Guid : sObjectMgr->GenerateEquipmentSetGuid(); + EquipmentSetInfo& eqSlot = _equipmentSets[setGuid]; eqSlot.Data = newEqSet; if (eqSlot.Data.Guid == 0) { - eqSlot.Data.Guid = sObjectMgr->GenerateEquipmentSetGuid(); + eqSlot.Data.Guid = setGuid; WorldPackets::EquipmentSet::EquipmentSetID data; data.GUID = eqSlot.Data.Guid; @@ -26608,7 +26607,7 @@ void Player::SetEquipmentSet(EquipmentSetInfo::EquipmentSetData const& newEqSet) SendDirectMessage(data.Write()); } - eqSlot.State = oldState == EQUIPMENT_SET_NEW ? EQUIPMENT_SET_NEW : EQUIPMENT_SET_CHANGED; + eqSlot.State = eqSlot.State == EQUIPMENT_SET_NEW ? EQUIPMENT_SET_NEW : EQUIPMENT_SET_CHANGED; } void Player::_SaveEquipmentSets(SQLTransaction& trans) -- cgit v1.2.3