Core: Updated to 10.0.2

This commit is contained in:
Shauren
2022-12-04 15:13:20 +01:00
parent de7c03c838
commit e98e1283ea
132 changed files with 9328 additions and 4629 deletions
@@ -141,7 +141,7 @@ EnumCharactersResult::CharacterInfo::CharacterInfo(Field* fields)
LastLoginVersion = fields[22].GetUInt32();
for (uint8 slot = 0; slot < INVENTORY_SLOT_BAG_END; ++slot)
for (uint8 slot = 0; slot < REAGENT_BAG_SLOT_END; ++slot)
{
uint32 visualBase = slot * 5;
VisualItems[slot].InvType = Trinity::StringTo<uint8>(equipment[visualBase + 0]).value_or(0);
@@ -193,9 +193,9 @@ ByteBuffer& operator<<(ByteBuffer& data, EnumCharactersResult::CharacterInfo con
data << visualItem;
data << charInfo.LastPlayedTime;
data << uint16(charInfo.SpecID);
data << uint32(charInfo.Unknown703);
data << uint32(charInfo.LastLoginVersion);
data << int16(charInfo.SpecID);
data << int32(charInfo.Unknown703);
data << int32(charInfo.LastLoginVersion);
data << uint32(charInfo.Flags4);
data << uint32(charInfo.MailSenders.size());
data << uint32(charInfo.MailSenderTypes.size());
@@ -245,6 +245,14 @@ ByteBuffer& operator<<(ByteBuffer& data, EnumCharactersResult::UnlockedCondition
return data;
}
ByteBuffer& operator<<(ByteBuffer& data, EnumCharactersResult::RaceLimitDisableInfo const& raceLimitDisableInfo)
{
data << int32(raceLimitDisableInfo.RaceID);
data << int32(raceLimitDisableInfo.BlockReason);
return data;
}
WorldPacket const* EnumCharactersResult::Write()
{
_worldPacket.reserve(9 + Characters.size() * sizeof(CharacterInfo) + RaceUnlockData.size() * sizeof(RaceUnlock));
@@ -254,12 +262,14 @@ WorldPacket const* EnumCharactersResult::Write()
_worldPacket.WriteBit(IsNewPlayerRestrictionSkipped);
_worldPacket.WriteBit(IsNewPlayerRestricted);
_worldPacket.WriteBit(IsNewPlayer);
_worldPacket.WriteBit(IsTrialAccountRestricted);
_worldPacket.WriteBit(DisabledClassesMask.has_value());
_worldPacket.WriteBit(IsAlliedRacesCreationAllowed);
_worldPacket << uint32(Characters.size());
_worldPacket << int32(MaxCharacterLevel);
_worldPacket << uint32(RaceUnlockData.size());
_worldPacket << uint32(UnlockedConditionalAppearances.size());
_worldPacket << uint32(RaceLimitDisables.size());
if (DisabledClassesMask)
_worldPacket << uint32(*DisabledClassesMask);
@@ -267,6 +277,9 @@ WorldPacket const* EnumCharactersResult::Write()
for (UnlockedConditionalAppearance const& unlockedConditionalAppearance : UnlockedConditionalAppearances)
_worldPacket << unlockedConditionalAppearance;
for (RaceLimitDisableInfo const& raceLimitDisableInfo : RaceLimitDisables)
_worldPacket << raceLimitDisableInfo;
for (CharacterInfo const& charInfo : Characters)
_worldPacket << charInfo;
@@ -377,6 +390,7 @@ void CharRaceOrFactionChange::Read()
_worldPacket >> RaceOrFactionChangeInfo->Guid;
_worldPacket >> RaceOrFactionChangeInfo->SexID;
_worldPacket >> RaceOrFactionChangeInfo->RaceID;
_worldPacket >> RaceOrFactionChangeInfo->InitialRaceID;
RaceOrFactionChangeInfo->Customizations.resize(_worldPacket.read<uint32>());
RaceOrFactionChangeInfo->Name = _worldPacket.ReadString(nameLength);
for (ChrCustomizationChoice& customization : RaceOrFactionChangeInfo->Customizations)
@@ -537,6 +551,7 @@ void AlterApperance::Read()
{
Customizations.resize(_worldPacket.read<uint32>());
_worldPacket >> NewSex;
_worldPacket >> CustomizedRace;
for (ChrCustomizationChoice& customization : Customizations)
_worldPacket >> customization;
@@ -556,7 +571,6 @@ WorldPacket const* LogXPGain::Write()
_worldPacket << uint8(Reason);
_worldPacket << int32(Amount);
_worldPacket << float(GroupBonus);
_worldPacket << uint8(ReferAFriendBonusType);
return &_worldPacket;
}