Core/Player: Fix issues with 'ignore this slot' option on equipment manager usage
This commit is contained in:
1 parent
176a2c1080
commit
e757ebf6ba
6 files changed
+70
-25
No files matched your search
@@ -16677,10 +16677,11 @@ void Player::_LoadEquipmentSets(PreparedQueryResult result)
|
||||
uint8 index = fields[1].GetUInt8();
|
||||
eqSet.Name = fields[2].GetString();
|
||||
eqSet.IconName = fields[3].GetString();
|
||||
eqSet.IgnoreMask = fields[4].GetUInt32();
|
||||
eqSet.state = EQUIPMENT_SET_UNCHANGED;
|
||||
|
||||
for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
|
||||
eqSet.Items[i] = fields[4+i].GetUInt32();
|
||||
eqSet.Items[i] = fields[5+i].GetUInt32();
|
||||
|
||||
m_EquipmentSets[index] = eqSet;
|
||||
|
||||
@@ -24822,7 +24823,13 @@ void Player::SendEquipmentSetList()
|
||||
data << itr->second.Name;
|
||||
data << itr->second.IconName;
|
||||
for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
|
||||
data.appendPackGUID(MAKE_NEW_GUID(itr->second.Items[i], 0, HIGHGUID_ITEM));
|
||||
{
|
||||
// ignored slots stored in IgnoreMask, client wants "1" as raw GUID, so no HIGHGUID_ITEM
|
||||
if (itr->second.IgnoreMask & (1 << i))
|
||||
data.appendPackGUID(MAKE_NEW_GUID(uint64(1)));
|
||||
else
|
||||
data.appendPackGUID(MAKE_NEW_GUID(itr->second.Items[i], 0, HIGHGUID_ITEM));
|
||||
}
|
||||
|
||||
++count; // client have limit but it checked at loading and set
|
||||
}
|
||||
@@ -24888,6 +24895,7 @@ void Player::_SaveEquipmentSets(SQLTransaction& trans)
|
||||
stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_EQUIP_SET);
|
||||
stmt->setString(j++, eqset.Name.c_str());
|
||||
stmt->setString(j++, eqset.IconName.c_str());
|
||||
stmt->setUInt32(j++, eqset.IgnoreMask);
|
||||
for (uint8 i=0; i<EQUIPMENT_SLOT_END; ++i)
|
||||
stmt->setUInt32(j++, eqset.Items[i]);
|
||||
stmt->setUInt32(j++, GetGUIDLow());
|
||||
@@ -24904,6 +24912,7 @@ void Player::_SaveEquipmentSets(SQLTransaction& trans)
|
||||
stmt->setUInt32(j++, index);
|
||||
stmt->setString(j++, eqset.Name.c_str());
|
||||
stmt->setString(j++, eqset.IconName.c_str());
|
||||
stmt->setUInt32(j++, eqset.IgnoreMask);
|
||||
for (uint8 i=0; i<EQUIPMENT_SLOT_END; ++i)
|
||||
stmt->setUInt32(j++, eqset.Items[i]);
|
||||
trans->Append(stmt);
|
||||
|
||||
Reference in new issue
Block a user