diff options
| -rw-r--r-- | src/server/game/Entities/Object/Updates/UpdateFields.cpp | 336 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Updates/UpdateFields.h | 200 |
2 files changed, 304 insertions, 232 deletions
diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.cpp b/src/server/game/Entities/Object/Updates/UpdateFields.cpp index 7c08835f494..8ae3f460fd8 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.cpp +++ b/src/server/game/Entities/Object/Updates/UpdateFields.cpp @@ -299,7 +299,7 @@ void ItemData::WriteCreate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisi data << uint32(Gems.size()); if (fieldVisibilityFlags.HasFlag(UpdateFieldFlag::Owner)) { - data << uint32(DynamicFlags2); + data << uint32(ZoneFlags); } data << ItemBonusKey; if (fieldVisibilityFlags.HasFlag(UpdateFieldFlag::Owner)) @@ -450,7 +450,7 @@ void ItemData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bool ignor } if (changesMask[20]) { - data << uint32(DynamicFlags2); + data << uint32(ZoneFlags); } if (changesMask[21]) { @@ -508,7 +508,7 @@ void ItemData::ClearChangesMask() Base::ClearChangesMask(ArtifactXP); Base::ClearChangesMask(ItemAppearanceModID); Base::ClearChangesMask(Modifiers); - Base::ClearChangesMask(DynamicFlags2); + Base::ClearChangesMask(ZoneFlags); Base::ClearChangesMask(ItemBonusKey); Base::ClearChangesMask(DEBUGItemLevel); Base::ClearChangesMask(SpellCharges); @@ -643,18 +643,21 @@ bool PassiveSpellHistory::operator==(PassiveSpellHistory const& right) const void UnitData::WriteCreate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags, Unit const* owner, Player const* receiver) const { + ViewerDependentValue<StateWorldEffectIDsTag>::value_type stateWorldEffectIDs = {}; + data << int64(Health); data << int64(MaxHealth); data << int32(ViewerDependentValue<DisplayIDTag>::GetValue(this, owner, receiver)); data << uint32(ViewerDependentValue<NpcFlagsTag>::GetValue(this, owner, receiver)); data << uint32(ViewerDependentValue<NpcFlags2Tag>::GetValue(this, owner, receiver)); - data << uint32(StateSpellVisualID); - data << uint32(StateAnimID); - data << uint32(StateAnimKitID); - data << uint32(StateWorldEffectIDs->size()); - for (uint32 i = 0; i < StateWorldEffectIDs->size(); ++i) + data << uint32(ViewerDependentValue<StateSpellVisualIDTag>::GetValue(this, owner, receiver)); + data << uint32(ViewerDependentValue<StateAnimIDTag>::GetValue(this, owner, receiver)); + data << uint32(ViewerDependentValue<StateAnimKitIDTag>::GetValue(this, owner, receiver)); + stateWorldEffectIDs = ViewerDependentValue<StateWorldEffectIDsTag>::GetValue(this, owner, receiver); + data << uint32(stateWorldEffectIDs->size()); + for (uint32 i = 0; i < stateWorldEffectIDs->size(); ++i) { - data << uint32((*StateWorldEffectIDs)[i]); + data << uint32((*stateWorldEffectIDs)[i]); } data << Charm; data << Summon; @@ -707,8 +710,9 @@ void UnitData::WriteCreate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisi data << uint32(ViewerDependentValue<FlagsTag>::GetValue(this, owner, receiver)); data << uint32(ViewerDependentValue<Flags2Tag>::GetValue(this, owner, receiver)); data << uint32(ViewerDependentValue<Flags3Tag>::GetValue(this, owner, receiver)); + data << uint32(ViewerDependentValue<Flags4Tag>::GetValue(this, owner, receiver)); data << uint32(ViewerDependentValue<AuraStateTag>::GetValue(this, owner, receiver)); - for (uint32 i = 0; i < 2; ++i) + for (uint32 i = 0; i < 3; ++i) { data << uint32(AttackRoundBaseTime[i]); } @@ -844,7 +848,7 @@ void UnitData::WriteCreate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisi void UnitData::WriteUpdate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags, Unit const* owner, Player const* receiver) const { - Mask allowedMaskForTarget({ 0xFFFF7FFFu, 0xFF0FDFFFu, 0xE001EFFFu, 0x001DFFFFu, 0xFFFFFE00u, 0x40003FFFu, 0x000FFFC0u, 0x00000000u }); + Mask allowedMaskForTarget({ 0xFFFF7FFFu, 0xFE1FBFFFu, 0xC003DFFFu, 0x003BFFFFu, 0xFFFFFC00u, 0x0000FFFFu, 0x003FFF01u, 0x00000000u }); AppendAllowedFieldsMaskForFlag(allowedMaskForTarget, fieldVisibilityFlags); WriteUpdate(data, _changesMask & allowedMaskForTarget, false, owner, receiver); } @@ -852,16 +856,16 @@ void UnitData::WriteUpdate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisi void UnitData::AppendAllowedFieldsMaskForFlag(Mask& allowedMaskForTarget, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags) { if (fieldVisibilityFlags.HasFlag(UpdateFieldFlag::Owner)) - allowedMaskForTarget |= std::array<uint32, 8>{ 0x00008000u, 0x00F02000u, 0x1FFE1000u, 0xFFF20000u, 0x000001FFu, 0xFFFFC000u, 0xFFF0003Fu, 0x00000003u }; + allowedMaskForTarget |= std::array<uint32, 8>{ 0x00008000u, 0x01E04000u, 0x3FFC2000u, 0xFFE40000u, 0x000003FFu, 0xFFFF0000u, 0xFFC000FFu, 0x0000000Fu }; if (fieldVisibilityFlags.HasFlag(UpdateFieldFlag::UnitAll)) - allowedMaskForTarget |= std::array<uint32, 8>{ 0x00000000u, 0x00000000u, 0x00000000u, 0xFFF00000u, 0x000001FFu, 0x00000000u, 0x00000000u, 0x00000000u }; + allowedMaskForTarget |= std::array<uint32, 8>{ 0x00000000u, 0x00000000u, 0x00000000u, 0xFFE00000u, 0x000003FFu, 0x00000000u, 0x00000000u, 0x00000000u }; if (fieldVisibilityFlags.HasFlag(UpdateFieldFlag::Empath)) - allowedMaskForTarget |= std::array<uint32, 8>{ 0x00000000u, 0x00F00000u, 0x00000000u, 0x00000000u, 0x00000000u, 0xC0000000u, 0x0000003Fu, 0x00000000u }; + allowedMaskForTarget |= std::array<uint32, 8>{ 0x00000000u, 0x01E00000u, 0x00000000u, 0x00000000u, 0x00000000u, 0x00000000u, 0x000000FFu, 0x00000000u }; } void UnitData::FilterDisallowedFieldsMaskForFlag(Mask& changesMask, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags) { - Mask allowedMaskForTarget({ 0xFFFF7FFFu, 0xFF0FDFFFu, 0xE001EFFFu, 0x001DFFFFu, 0xFFFFFE00u, 0x40003FFFu, 0x000FFFC0u, 0x00000000u }); + Mask allowedMaskForTarget({ 0xFFFF7FFFu, 0xFE1FBFFFu, 0xC003DFFFu, 0x003BFFFFu, 0xFFFFFC00u, 0x0000FFFFu, 0x003FFF01u, 0x00000000u }); AppendAllowedFieldsMaskForFlag(allowedMaskForTarget, fieldVisibilityFlags); changesMask &= allowedMaskForTarget; } @@ -873,14 +877,17 @@ void UnitData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bool ignor if (changesMask.GetBlock(i)) data.WriteBits(changesMask.GetBlock(i), 32); + ViewerDependentValue<StateWorldEffectIDsTag>::value_type stateWorldEffectIDs = {}; + if (changesMask[0]) { if (changesMask[1]) { - data.WriteBits(StateWorldEffectIDs->size(), 32); - for (uint32 i = 0; i < StateWorldEffectIDs->size(); ++i) + stateWorldEffectIDs = ViewerDependentValue<StateWorldEffectIDsTag>::GetValue(this, owner, receiver); + data.WriteBits(stateWorldEffectIDs->size(), 32); + for (uint32 i = 0; i < stateWorldEffectIDs->size(); ++i) { - data << uint32((*StateWorldEffectIDs)[i]); + data << uint32((*stateWorldEffectIDs)[i]); } } } @@ -964,15 +971,15 @@ void UnitData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bool ignor } if (changesMask[10]) { - data << uint32(StateSpellVisualID); + data << uint32(ViewerDependentValue<StateSpellVisualIDTag>::GetValue(this, owner, receiver)); } if (changesMask[11]) { - data << uint32(StateAnimID); + data << uint32(ViewerDependentValue<StateAnimIDTag>::GetValue(this, owner, receiver)); } if (changesMask[12]) { - data << uint32(StateAnimKitID); + data << uint32(ViewerDependentValue<StateAnimKitIDTag>::GetValue(this, owner, receiver)); } if (changesMask[13]) { @@ -1099,376 +1106,380 @@ void UnitData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bool ignor } if (changesMask[44]) { - data << uint32(ViewerDependentValue<AuraStateTag>::GetValue(this, owner, receiver)); + data << uint32(ViewerDependentValue<Flags4Tag>::GetValue(this, owner, receiver)); } if (changesMask[45]) { - data << uint32(RangedAttackRoundBaseTime); + data << uint32(ViewerDependentValue<AuraStateTag>::GetValue(this, owner, receiver)); } if (changesMask[46]) { - data << float(BoundingRadius); + data << uint32(RangedAttackRoundBaseTime); } if (changesMask[47]) { - data << float(CombatReach); + data << float(BoundingRadius); } if (changesMask[48]) { - data << float(DisplayScale); + data << float(CombatReach); } if (changesMask[49]) { - data << int32(NativeDisplayID); + data << float(DisplayScale); } if (changesMask[50]) { - data << float(NativeXDisplayScale); + data << int32(NativeDisplayID); } if (changesMask[51]) { - data << int32(MountDisplayID); + data << float(NativeXDisplayScale); } if (changesMask[52]) { - data << float(MinDamage); + data << int32(MountDisplayID); } if (changesMask[53]) { - data << float(MaxDamage); + data << float(MinDamage); } if (changesMask[54]) { - data << float(MinOffHandDamage); + data << float(MaxDamage); } if (changesMask[55]) { - data << float(MaxOffHandDamage); + data << float(MinOffHandDamage); } if (changesMask[56]) { - data << uint8(StandState); + data << float(MaxOffHandDamage); } if (changesMask[57]) { - data << uint8(PetTalentPoints); + data << uint8(StandState); } if (changesMask[58]) { - data << uint8(VisFlags); + data << uint8(PetTalentPoints); } if (changesMask[59]) { - data << uint8(AnimTier); + data << uint8(VisFlags); } if (changesMask[60]) { - data << uint32(PetNumber); + data << uint8(AnimTier); } if (changesMask[61]) { - data << uint32(PetNameTimestamp); + data << uint32(PetNumber); } if (changesMask[62]) { - data << uint32(PetExperience); + data << uint32(PetNameTimestamp); } if (changesMask[63]) { - data << uint32(PetNextLevelExperience); + data << uint32(PetExperience); } } if (changesMask[64]) { if (changesMask[65]) { - data << float(ModCastingSpeed); + data << uint32(PetNextLevelExperience); } if (changesMask[66]) { - data << float(ModSpellHaste); + data << float(ModCastingSpeed); } if (changesMask[67]) { - data << float(ModHaste); + data << float(ModSpellHaste); } if (changesMask[68]) { - data << float(ModRangedHaste); + data << float(ModHaste); } if (changesMask[69]) { - data << float(ModHasteRegen); + data << float(ModRangedHaste); } if (changesMask[70]) { - data << float(ModTimeRate); + data << float(ModHasteRegen); } if (changesMask[71]) { - data << int32(CreatedBySpell); + data << float(ModTimeRate); } if (changesMask[72]) { - data << int32(EmoteState); + data << int32(CreatedBySpell); } if (changesMask[73]) { - data << int16(TrainingPointsUsed); + data << int32(EmoteState); } if (changesMask[74]) { - data << int16(TrainingPointsTotal); + data << int16(TrainingPointsUsed); } if (changesMask[75]) { - data << int32(BaseMana); + data << int16(TrainingPointsTotal); } if (changesMask[76]) { - data << int32(BaseHealth); + data << int32(BaseMana); } if (changesMask[77]) { - data << uint8(SheatheState); + data << int32(BaseHealth); } if (changesMask[78]) { - data << uint8(ViewerDependentValue<PvpFlagsTag>::GetValue(this, owner, receiver)); + data << uint8(SheatheState); } if (changesMask[79]) { - data << uint8(PetFlags); + data << uint8(ViewerDependentValue<PvpFlagsTag>::GetValue(this, owner, receiver)); } if (changesMask[80]) { - data << uint8(ShapeshiftForm); + data << uint8(PetFlags); } if (changesMask[81]) { - data << int32(AttackPower); + data << uint8(ShapeshiftForm); } if (changesMask[82]) { - data << int32(AttackPowerModPos); + data << int32(AttackPower); } if (changesMask[83]) { - data << int32(AttackPowerModNeg); + data << int32(AttackPowerModPos); } if (changesMask[84]) { - data << float(AttackPowerMultiplier); + data << int32(AttackPowerModNeg); } if (changesMask[85]) { - data << int32(RangedAttackPower); + data << float(AttackPowerMultiplier); } if (changesMask[86]) { - data << int32(RangedAttackPowerModPos); + data << int32(RangedAttackPower); } if (changesMask[87]) { - data << int32(RangedAttackPowerModNeg); + data << int32(RangedAttackPowerModPos); } if (changesMask[88]) { - data << float(RangedAttackPowerMultiplier); + data << int32(RangedAttackPowerModNeg); } if (changesMask[89]) { - data << int32(SetAttackSpeedAura); + data << float(RangedAttackPowerMultiplier); } if (changesMask[90]) { - data << float(Lifesteal); + data << int32(SetAttackSpeedAura); } if (changesMask[91]) { - data << float(MinRangedDamage); + data << float(Lifesteal); } if (changesMask[92]) { - data << float(MaxRangedDamage); + data << float(MinRangedDamage); } if (changesMask[93]) { - data << float(MaxHealthModifier); + data << float(MaxRangedDamage); } if (changesMask[94]) { - data << float(HoverHeight); + data << float(MaxHealthModifier); } if (changesMask[95]) { - data << int32(MinItemLevelCutoff); + data << float(HoverHeight); } } if (changesMask[96]) { if (changesMask[97]) { - data << int32(MinItemLevel); + data << int32(MinItemLevelCutoff); } if (changesMask[98]) { - data << int32(MaxItemLevel); + data << int32(MinItemLevel); } if (changesMask[99]) { - data << int32(WildBattlePetLevel); + data << int32(MaxItemLevel); } if (changesMask[100]) { - data << uint32(BattlePetCompanionNameTimestamp); + data << int32(WildBattlePetLevel); } if (changesMask[101]) { - data << int32(ViewerDependentValue<InteractSpellIDTag>::GetValue(this, owner, receiver)); + data << uint32(BattlePetCompanionNameTimestamp); } if (changesMask[102]) { - data << int32(ScaleDuration); + data << int32(ViewerDependentValue<InteractSpellIDTag>::GetValue(this, owner, receiver)); } if (changesMask[103]) { - data << int32(LooksLikeMountID); + data << int32(ScaleDuration); } if (changesMask[104]) { - data << int32(LooksLikeCreatureID); + data << int32(LooksLikeMountID); } if (changesMask[105]) { - data << int32(LookAtControllerID); + data << int32(LooksLikeCreatureID); } if (changesMask[106]) { - data << int32(PerksVendorItemID); + data << int32(LookAtControllerID); } if (changesMask[107]) { - data << GuildGUID; + data << int32(PerksVendorItemID); } if (changesMask[108]) { - data << SkinningOwnerGUID; + data << GuildGUID; } if (changesMask[109]) { - data << int32(FlightCapabilityID); + data << SkinningOwnerGUID; } if (changesMask[110]) { - data << float(GlideEventSpeedDivisor); + data << int32(FlightCapabilityID); } if (changesMask[111]) { - data << uint32(SilencedSchoolMask); + data << float(GlideEventSpeedDivisor); } if (changesMask[112]) { - data << uint32(CurrentAreaID); + data << uint32(SilencedSchoolMask); } if (changesMask[113]) { - data << ComboTarget; + data << uint32(CurrentAreaID); } if (changesMask[114]) { - data << float(Field_2F0); + data << ComboTarget; } if (changesMask[115]) { + data << float(Field_2F0); + } + if (changesMask[116]) + { data << float(Field_2F4); } } - if (changesMask[116]) + if (changesMask[117]) { for (uint32 i = 0; i < 10; ++i) { - if (changesMask[117 + i]) + if (changesMask[118 + i]) { data << float(PowerRegenFlatModifier[i]); } - if (changesMask[127 + i]) + if (changesMask[128 + i]) { data << float(PowerRegenInterruptedFlatModifier[i]); } - if (changesMask[137 + i]) + if (changesMask[138 + i]) { data << int32(Power[i]); } - if (changesMask[147 + i]) + if (changesMask[148 + i]) { data << int32(MaxPower[i]); } - if (changesMask[157 + i]) + if (changesMask[158 + i]) { data << float(ModPowerRegen[i]); } } } - if (changesMask[167]) + if (changesMask[168]) { for (uint32 i = 0; i < 3; ++i) { - if (changesMask[168 + i]) + if (changesMask[169 + i]) { VirtualItems[i].WriteUpdate(data, ignoreNestedChangesMask, owner, receiver); } } } - if (changesMask[171]) + if (changesMask[172]) { - for (uint32 i = 0; i < 2; ++i) + for (uint32 i = 0; i < 3; ++i) { - if (changesMask[172 + i]) + if (changesMask[173 + i]) { data << uint32(AttackRoundBaseTime[i]); } } } - if (changesMask[174]) + if (changesMask[176]) { for (uint32 i = 0; i < 5; ++i) { - if (changesMask[175 + i]) + if (changesMask[177 + i]) { data << int32(Stats[i]); } - if (changesMask[180 + i]) + if (changesMask[182 + i]) { data << int32(StatPosBuff[i]); } - if (changesMask[185 + i]) + if (changesMask[187 + i]) { data << int32(StatNegBuff[i]); } } } - if (changesMask[190]) + if (changesMask[192]) { for (uint32 i = 0; i < 7; ++i) { - if (changesMask[191 + i]) + if (changesMask[193 + i]) { data << int32(Resistances[i]); } - if (changesMask[198 + i]) + if (changesMask[200 + i]) { data << int32(ResistanceBuffModsPositive[i]); } - if (changesMask[205 + i]) + if (changesMask[207 + i]) { data << int32(ResistanceBuffModsNegative[i]); } - if (changesMask[212 + i]) + if (changesMask[214 + i]) { data << int32(PowerCostModifier[i]); } - if (changesMask[219 + i]) + if (changesMask[221 + i]) { data << float(PowerCostMultiplier[i]); } @@ -1520,6 +1531,7 @@ void UnitData::ClearChangesMask() Base::ClearChangesMask(Flags); Base::ClearChangesMask(Flags2); Base::ClearChangesMask(Flags3); + Base::ClearChangesMask(Flags4); Base::ClearChangesMask(AuraState); Base::ClearChangesMask(RangedAttackRoundBaseTime); Base::ClearChangesMask(BoundingRadius); @@ -2417,50 +2429,84 @@ void SkillInfo::ClearChangesMask() _changesMask.ResetAll(); } -void BitVectors::WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const +void BitVector::WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const { - for (uint32 i = 0; i < 11; ++i) + data << uint32(Values.size()); + for (uint32 i = 0; i < Values.size(); ++i) { - data << uint32(Values[i].size()); - for (uint32 j = 0; j < Values[i].size(); ++j) - { - data << uint64(Values[i][j]); - } + data << uint64(Values[i]); } } -void BitVectors::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const* owner, Player const* receiver) const +void BitVector::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const* owner, Player const* receiver) const { Mask changesMask = _changesMask; if (ignoreChangesMask) changesMask.SetAll(); - data.WriteBits(changesMask.GetBlock(0), 1); + data.WriteBits(changesMask.GetBlock(0), 2); if (changesMask[0]) { - for (uint32 i = 0; i < 11; ++i) + if (changesMask[1]) { if (!ignoreChangesMask) - Values[i].WriteUpdateMask(data); + Values.WriteUpdateMask(data); else - WriteCompleteDynamicFieldUpdateMask(Values[i].size(), data); + WriteCompleteDynamicFieldUpdateMask(Values.size(), data); } } + data.FlushBits(); if (changesMask[0]) { - for (uint32 i = 0; i < 11; ++i) + if (changesMask[1]) { - for (uint32 j = 0; j < Values[i].size(); ++j) + for (uint32 i = 0; i < Values.size(); ++i) { - if (Values[i].HasChanged(j) || ignoreChangesMask) + if (Values.HasChanged(i) || ignoreChangesMask) { - data << uint64(Values[i][j]); + data << uint64(Values[i]); } } } } +} + +void BitVector::ClearChangesMask() +{ + Base::ClearChangesMask(Values); + _changesMask.ResetAll(); +} + +void BitVectors::WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const +{ + for (uint32 i = 0; i < 13; ++i) + { + Values[i].WriteCreate(data, owner, receiver); + } +} + +void BitVectors::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const* owner, Player const* receiver) const +{ + Mask changesMask = _changesMask; + if (ignoreChangesMask) + changesMask.SetAll(); + + data.WriteBits(changesMask.GetBlocksMask(0), 1); + if (changesMask.GetBlock(0)) + data.WriteBits(changesMask.GetBlock(0), 32); + data.FlushBits(); + if (changesMask[0]) + { + for (uint32 i = 0; i < 13; ++i) + { + if (changesMask[1 + i]) + { + Values[i].WriteUpdate(data, ignoreChangesMask, owner, receiver); + } + } + } } void BitVectors::ClearChangesMask() @@ -4785,15 +4831,18 @@ void ActivePlayerData::ClearChangesMask() void GameObjectData::WriteCreate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags, GameObject const* owner, Player const* receiver) const { + ViewerDependentValue<StateWorldEffectIDsTag>::value_type stateWorldEffectIDs = {}; + data << int32(DisplayID); data << uint32(SpellVisualID); - data << uint32(StateSpellVisualID); - data << uint32(SpawnTrackingStateAnimID); - data << uint32(SpawnTrackingStateAnimKitID); - data << uint32(StateWorldEffectIDs->size()); - for (uint32 i = 0; i < StateWorldEffectIDs->size(); ++i) + data << uint32(ViewerDependentValue<StateSpellVisualIDTag>::GetValue(this, owner, receiver)); + data << uint32(ViewerDependentValue<SpawnTrackingStateAnimIDTag>::GetValue(this, owner, receiver)); + data << uint32(ViewerDependentValue<SpawnTrackingStateAnimKitIDTag>::GetValue(this, owner, receiver)); + stateWorldEffectIDs = ViewerDependentValue<StateWorldEffectIDsTag>::GetValue(this, owner, receiver); + data << uint32(stateWorldEffectIDs->size()); + for (uint32 i = 0; i < stateWorldEffectIDs->size(); ++i) { - data << uint32((*StateWorldEffectIDs)[i]); + data << uint32((*stateWorldEffectIDs)[i]); } data << CreatedBy; data << GuildGUID; @@ -4830,14 +4879,17 @@ void GameObjectData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bool { data.WriteBits(changesMask.GetBlock(0), 20); + ViewerDependentValue<StateWorldEffectIDsTag>::value_type stateWorldEffectIDs = {}; + if (changesMask[0]) { if (changesMask[1]) { - data.WriteBits(StateWorldEffectIDs->size(), 32); - for (uint32 i = 0; i < StateWorldEffectIDs->size(); ++i) + stateWorldEffectIDs = ViewerDependentValue<StateWorldEffectIDsTag>::GetValue(this, owner, receiver); + data.WriteBits(stateWorldEffectIDs->size(), 32); + for (uint32 i = 0; i < stateWorldEffectIDs->size(); ++i) { - data << uint32((*StateWorldEffectIDs)[i]); + data << uint32((*stateWorldEffectIDs)[i]); } } } @@ -4892,15 +4944,15 @@ void GameObjectData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bool } if (changesMask[6]) { - data << uint32(StateSpellVisualID); + data << uint32(ViewerDependentValue<StateSpellVisualIDTag>::GetValue(this, owner, receiver)); } if (changesMask[7]) { - data << uint32(SpawnTrackingStateAnimID); + data << uint32(ViewerDependentValue<SpawnTrackingStateAnimIDTag>::GetValue(this, owner, receiver)); } if (changesMask[8]) { - data << uint32(SpawnTrackingStateAnimKitID); + data << uint32(ViewerDependentValue<SpawnTrackingStateAnimKitIDTag>::GetValue(this, owner, receiver)); } if (changesMask[9]) { @@ -5229,7 +5281,7 @@ void VisualAnim::WriteCreate(ByteBuffer& data, AreaTrigger const* owner, Player data << uint32(AnimationDataID); data << uint32(AnimKitID); data << uint32(AnimProgress); - data.WriteBit(Field_C); + data.WriteBit(IsDecay); data.FlushBits(); } @@ -5245,7 +5297,7 @@ void VisualAnim::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, AreaTrigg { if (changesMask[1]) { - data.WriteBit(Field_C); + data.WriteBit(IsDecay); } } data.FlushBits(); @@ -5269,7 +5321,7 @@ void VisualAnim::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, AreaTrigg void VisualAnim::ClearChangesMask() { - Base::ClearChangesMask(Field_C); + Base::ClearChangesMask(IsDecay); Base::ClearChangesMask(AnimationDataID); Base::ClearChangesMask(AnimKitID); Base::ClearChangesMask(AnimProgress); diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h index 9caf0e92e16..7cb26c6eef0 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.h +++ b/src/server/game/Entities/Object/Updates/UpdateFields.h @@ -37,6 +37,7 @@ class Bag; class ByteBuffer; class Conversation; class Corpse; +class Creature; class DynamicObject; class GameObject; class Item; @@ -136,7 +137,7 @@ struct ItemData : public IsUpdateFieldStructureTag, public HasChangesMask<43> UpdateField<uint64, 0, 17> ArtifactXP; UpdateField<uint8, 0, 18> ItemAppearanceModID; UpdateField<UF::ItemModList, 0, 19> Modifiers; - UpdateField<uint32, 0, 20> DynamicFlags2; + UpdateField<uint32, 0, 20> ZoneFlags; UpdateField<WorldPackets::Item::ItemBonusKey, 0, 21> ItemBonusKey; UpdateField<uint16, 0, 22> DEBUGItemLevel; UpdateFieldArray<int32, 5, 23, 24> SpellCharges; @@ -194,9 +195,10 @@ struct PassiveSpellHistory : public IsUpdateFieldStructureTag bool operator!=(PassiveSpellHistory const& right) const { return !(*this == right); } }; -struct UnitData : public IsUpdateFieldStructureTag, public HasChangesMask<226> +struct UnitData : public IsUpdateFieldStructureTag, public HasChangesMask<228> { UpdateField<std::vector<uint32>, 0, 1> StateWorldEffectIDs; + struct StateWorldEffectIDsTag : ViewerDependentValueTag<std::vector<uint32>> {}; DynamicUpdateField<UF::PassiveSpellHistory, 0, 2> PassiveSpells; DynamicUpdateField<int32, 0, 3> WorldEffects; DynamicUpdateField<ObjectGuid, 0, 4> ChannelObjects; @@ -209,8 +211,11 @@ struct UnitData : public IsUpdateFieldStructureTag, public HasChangesMask<226> UpdateField<uint32, 0, 9> NpcFlags2; struct NpcFlags2Tag : ViewerDependentValueTag<uint32> {}; UpdateField<uint32, 0, 10> StateSpellVisualID; + struct StateSpellVisualIDTag : ViewerDependentValueTag<uint32> {}; UpdateField<uint32, 0, 11> StateAnimID; + struct StateAnimIDTag : ViewerDependentValueTag<uint32> {}; UpdateField<uint32, 0, 12> StateAnimKitID; + struct StateAnimKitIDTag : ViewerDependentValueTag<uint32> {}; UpdateField<ObjectGuid, 0, 13> Charm; UpdateField<ObjectGuid, 0, 14> Summon; UpdateField<ObjectGuid, 0, 15> Critter; @@ -245,94 +250,96 @@ struct UnitData : public IsUpdateFieldStructureTag, public HasChangesMask<226> struct Flags2Tag : ViewerDependentValueTag<uint32> {}; UpdateField<uint32, 32, 43> Flags3; struct Flags3Tag : ViewerDependentValueTag<uint32> {}; - UpdateField<uint32, 32, 44> AuraState; + UpdateField<uint32, 32, 44> Flags4; + struct Flags4Tag : ViewerDependentValueTag<uint32> {}; + UpdateField<uint32, 32, 45> AuraState; struct AuraStateTag : ViewerDependentValueTag<uint32> {}; - UpdateField<uint32, 32, 45> RangedAttackRoundBaseTime; - UpdateField<float, 32, 46> BoundingRadius; - UpdateField<float, 32, 47> CombatReach; - UpdateField<float, 32, 48> DisplayScale; - UpdateField<int32, 32, 49> NativeDisplayID; - UpdateField<float, 32, 50> NativeXDisplayScale; - UpdateField<int32, 32, 51> MountDisplayID; - UpdateField<float, 32, 52> MinDamage; - UpdateField<float, 32, 53> MaxDamage; - UpdateField<float, 32, 54> MinOffHandDamage; - UpdateField<float, 32, 55> MaxOffHandDamage; - UpdateField<uint8, 32, 56> StandState; - UpdateField<uint8, 32, 57> PetTalentPoints; - UpdateField<uint8, 32, 58> VisFlags; - UpdateField<uint8, 32, 59> AnimTier; - UpdateField<uint32, 32, 60> PetNumber; - UpdateField<uint32, 32, 61> PetNameTimestamp; - UpdateField<uint32, 32, 62> PetExperience; - UpdateField<uint32, 32, 63> PetNextLevelExperience; - UpdateField<float, 64, 65> ModCastingSpeed; - UpdateField<float, 64, 66> ModSpellHaste; - UpdateField<float, 64, 67> ModHaste; - UpdateField<float, 64, 68> ModRangedHaste; - UpdateField<float, 64, 69> ModHasteRegen; - UpdateField<float, 64, 70> ModTimeRate; - UpdateField<int32, 64, 71> CreatedBySpell; - UpdateField<int32, 64, 72> EmoteState; - UpdateField<int16, 64, 73> TrainingPointsUsed; - UpdateField<int16, 64, 74> TrainingPointsTotal; - UpdateField<int32, 64, 75> BaseMana; - UpdateField<int32, 64, 76> BaseHealth; - UpdateField<uint8, 64, 77> SheatheState; - UpdateField<uint8, 64, 78> PvpFlags; + UpdateField<uint32, 32, 46> RangedAttackRoundBaseTime; + UpdateField<float, 32, 47> BoundingRadius; + UpdateField<float, 32, 48> CombatReach; + UpdateField<float, 32, 49> DisplayScale; + UpdateField<int32, 32, 50> NativeDisplayID; + UpdateField<float, 32, 51> NativeXDisplayScale; + UpdateField<int32, 32, 52> MountDisplayID; + UpdateField<float, 32, 53> MinDamage; + UpdateField<float, 32, 54> MaxDamage; + UpdateField<float, 32, 55> MinOffHandDamage; + UpdateField<float, 32, 56> MaxOffHandDamage; + UpdateField<uint8, 32, 57> StandState; + UpdateField<uint8, 32, 58> PetTalentPoints; + UpdateField<uint8, 32, 59> VisFlags; + UpdateField<uint8, 32, 60> AnimTier; + UpdateField<uint32, 32, 61> PetNumber; + UpdateField<uint32, 32, 62> PetNameTimestamp; + UpdateField<uint32, 32, 63> PetExperience; + UpdateField<uint32, 64, 65> PetNextLevelExperience; + UpdateField<float, 64, 66> ModCastingSpeed; + UpdateField<float, 64, 67> ModSpellHaste; + UpdateField<float, 64, 68> ModHaste; + UpdateField<float, 64, 69> ModRangedHaste; + UpdateField<float, 64, 70> ModHasteRegen; + UpdateField<float, 64, 71> ModTimeRate; + UpdateField<int32, 64, 72> CreatedBySpell; + UpdateField<int32, 64, 73> EmoteState; + UpdateField<int16, 64, 74> TrainingPointsUsed; + UpdateField<int16, 64, 75> TrainingPointsTotal; + UpdateField<int32, 64, 76> BaseMana; + UpdateField<int32, 64, 77> BaseHealth; + UpdateField<uint8, 64, 78> SheatheState; + UpdateField<uint8, 64, 79> PvpFlags; struct PvpFlagsTag : ViewerDependentValueTag<uint8> {}; - UpdateField<uint8, 64, 79> PetFlags; - UpdateField<uint8, 64, 80> ShapeshiftForm; - UpdateField<int32, 64, 81> AttackPower; - UpdateField<int32, 64, 82> AttackPowerModPos; - UpdateField<int32, 64, 83> AttackPowerModNeg; - UpdateField<float, 64, 84> AttackPowerMultiplier; - UpdateField<int32, 64, 85> RangedAttackPower; - UpdateField<int32, 64, 86> RangedAttackPowerModPos; - UpdateField<int32, 64, 87> RangedAttackPowerModNeg; - UpdateField<float, 64, 88> RangedAttackPowerMultiplier; - UpdateField<int32, 64, 89> SetAttackSpeedAura; - UpdateField<float, 64, 90> Lifesteal; - UpdateField<float, 64, 91> MinRangedDamage; - UpdateField<float, 64, 92> MaxRangedDamage; - UpdateField<float, 64, 93> MaxHealthModifier; - UpdateField<float, 64, 94> HoverHeight; - UpdateField<int32, 64, 95> MinItemLevelCutoff; - UpdateField<int32, 96, 97> MinItemLevel; - UpdateField<int32, 96, 98> MaxItemLevel; - UpdateField<int32, 96, 99> WildBattlePetLevel; - UpdateField<uint32, 96, 100> BattlePetCompanionNameTimestamp; - UpdateField<int32, 96, 101> InteractSpellID; + UpdateField<uint8, 64, 80> PetFlags; + UpdateField<uint8, 64, 81> ShapeshiftForm; + UpdateField<int32, 64, 82> AttackPower; + UpdateField<int32, 64, 83> AttackPowerModPos; + UpdateField<int32, 64, 84> AttackPowerModNeg; + UpdateField<float, 64, 85> AttackPowerMultiplier; + UpdateField<int32, 64, 86> RangedAttackPower; + UpdateField<int32, 64, 87> RangedAttackPowerModPos; + UpdateField<int32, 64, 88> RangedAttackPowerModNeg; + UpdateField<float, 64, 89> RangedAttackPowerMultiplier; + UpdateField<int32, 64, 90> SetAttackSpeedAura; + UpdateField<float, 64, 91> Lifesteal; + UpdateField<float, 64, 92> MinRangedDamage; + UpdateField<float, 64, 93> MaxRangedDamage; + UpdateField<float, 64, 94> MaxHealthModifier; + UpdateField<float, 64, 95> HoverHeight; + UpdateField<int32, 96, 97> MinItemLevelCutoff; + UpdateField<int32, 96, 98> MinItemLevel; + UpdateField<int32, 96, 99> MaxItemLevel; + UpdateField<int32, 96, 100> WildBattlePetLevel; + UpdateField<uint32, 96, 101> BattlePetCompanionNameTimestamp; + UpdateField<int32, 96, 102> InteractSpellID; struct InteractSpellIDTag : ViewerDependentValueTag<int32> {}; - UpdateField<int32, 96, 102> ScaleDuration; - UpdateField<int32, 96, 103> LooksLikeMountID; - UpdateField<int32, 96, 104> LooksLikeCreatureID; - UpdateField<int32, 96, 105> LookAtControllerID; - UpdateField<int32, 96, 106> PerksVendorItemID; - UpdateField<ObjectGuid, 96, 107> GuildGUID; - UpdateField<ObjectGuid, 96, 108> SkinningOwnerGUID; - UpdateField<int32, 96, 109> FlightCapabilityID; - UpdateField<float, 96, 110> GlideEventSpeedDivisor; // Movement speed gets divided by this value when evaluating what GlideEvents to use - UpdateField<uint32, 96, 111> SilencedSchoolMask; - UpdateField<uint32, 96, 112> CurrentAreaID; - UpdateField<ObjectGuid, 96, 113> ComboTarget; - UpdateField<float, 96, 114> Field_2F0; - UpdateField<float, 96, 115> Field_2F4; - UpdateFieldArray<float, 10, 116, 117> PowerRegenFlatModifier; - UpdateFieldArray<float, 10, 116, 127> PowerRegenInterruptedFlatModifier; - UpdateFieldArray<int32, 10, 116, 137> Power; - UpdateFieldArray<int32, 10, 116, 147> MaxPower; - UpdateFieldArray<float, 10, 116, 157> ModPowerRegen; // Applies to power regen only if expansion < 2, hidden from lua - UpdateFieldArray<UF::VisibleItem, 3, 167, 168> VirtualItems; - UpdateFieldArray<uint32, 2, 171, 172> AttackRoundBaseTime; - UpdateFieldArray<int32, 5, 174, 175> Stats; - UpdateFieldArray<int32, 5, 174, 180> StatPosBuff; - UpdateFieldArray<int32, 5, 174, 185> StatNegBuff; - UpdateFieldArray<int32, 7, 190, 191> Resistances; - UpdateFieldArray<int32, 7, 190, 198> ResistanceBuffModsPositive; - UpdateFieldArray<int32, 7, 190, 205> ResistanceBuffModsNegative; - UpdateFieldArray<int32, 7, 190, 212> PowerCostModifier; - UpdateFieldArray<float, 7, 190, 219> PowerCostMultiplier; + UpdateField<int32, 96, 103> ScaleDuration; + UpdateField<int32, 96, 104> LooksLikeMountID; + UpdateField<int32, 96, 105> LooksLikeCreatureID; + UpdateField<int32, 96, 106> LookAtControllerID; + UpdateField<int32, 96, 107> PerksVendorItemID; + UpdateField<ObjectGuid, 96, 108> GuildGUID; + UpdateField<ObjectGuid, 96, 109> SkinningOwnerGUID; + UpdateField<int32, 96, 110> FlightCapabilityID; + UpdateField<float, 96, 111> GlideEventSpeedDivisor; // Movement speed gets divided by this value when evaluating what GlideEvents to use + UpdateField<uint32, 96, 112> SilencedSchoolMask; + UpdateField<uint32, 96, 113> CurrentAreaID; + UpdateField<ObjectGuid, 96, 114> ComboTarget; + UpdateField<float, 96, 115> Field_2F0; + UpdateField<float, 96, 116> Field_2F4; + UpdateFieldArray<float, 10, 117, 118> PowerRegenFlatModifier; + UpdateFieldArray<float, 10, 117, 128> PowerRegenInterruptedFlatModifier; + UpdateFieldArray<int32, 10, 117, 138> Power; + UpdateFieldArray<int32, 10, 117, 148> MaxPower; + UpdateFieldArray<float, 10, 117, 158> ModPowerRegen; // Applies to power regen only if expansion < 2, hidden from lua + UpdateFieldArray<UF::VisibleItem, 3, 168, 169> VirtualItems; + UpdateFieldArray<uint32, 3, 172, 173> AttackRoundBaseTime; + UpdateFieldArray<int32, 5, 176, 177> Stats; + UpdateFieldArray<int32, 5, 176, 182> StatPosBuff; + UpdateFieldArray<int32, 5, 176, 187> StatNegBuff; + UpdateFieldArray<int32, 7, 192, 193> Resistances; + UpdateFieldArray<int32, 7, 192, 200> ResistanceBuffModsPositive; + UpdateFieldArray<int32, 7, 192, 207> ResistanceBuffModsNegative; + UpdateFieldArray<int32, 7, 192, 214> PowerCostModifier; + UpdateFieldArray<float, 7, 192, 221> PowerCostMultiplier; void WriteCreate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags, Unit const* owner, Player const* receiver) const; void WriteUpdate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags, Unit const* owner, Player const* receiver) const; @@ -483,9 +490,18 @@ struct SkillInfo : public IsUpdateFieldStructureTag, public HasChangesMask<1793> void ClearChangesMask(); }; -struct BitVectors : public IsUpdateFieldStructureTag, public HasChangesMask<1> +struct BitVector : public IsUpdateFieldStructureTag, public HasChangesMask<2> { - UpdateFieldArray<DynamicUpdateFieldBase<uint64>, 11, 0, -1> Values; + DynamicUpdateField<uint64, 0, 1> Values; + + void WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const; + void WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const* owner, Player const* receiver) const; + void ClearChangesMask(); +}; + +struct BitVectors : public IsUpdateFieldStructureTag, public HasChangesMask<14> +{ + UpdateFieldArray<UF::BitVector, 13, 0, 1> Values; void WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const; void WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const* owner, Player const* receiver) const; @@ -867,13 +883,17 @@ struct ActivePlayerData : public IsUpdateFieldStructureTag, public HasChangesMas struct GameObjectData : public IsUpdateFieldStructureTag, public HasChangesMask<20> { UpdateField<std::vector<uint32>, 0, 1> StateWorldEffectIDs; + struct StateWorldEffectIDsTag : ViewerDependentValueTag<std::vector<uint32>> {}; DynamicUpdateField<int32, 0, 2> EnableDoodadSets; DynamicUpdateField<int32, 0, 3> WorldEffects; UpdateField<int32, 0, 4> DisplayID; UpdateField<uint32, 0, 5> SpellVisualID; UpdateField<uint32, 0, 6> StateSpellVisualID; + struct StateSpellVisualIDTag : ViewerDependentValueTag<uint32> {}; UpdateField<uint32, 0, 7> SpawnTrackingStateAnimID; + struct SpawnTrackingStateAnimIDTag : ViewerDependentValueTag<uint32> {}; UpdateField<uint32, 0, 8> SpawnTrackingStateAnimKitID; + struct SpawnTrackingStateAnimKitIDTag : ViewerDependentValueTag<uint32> {}; UpdateField<ObjectGuid, 0, 9> CreatedBy; UpdateField<ObjectGuid, 0, 10> GuildGUID; UpdateField<uint32, 0, 11> Flags; @@ -944,7 +964,7 @@ struct ScaleCurve : public IsUpdateFieldStructureTag, public HasChangesMask<7> struct VisualAnim : public IsUpdateFieldStructureTag, public HasChangesMask<5> { - UpdateField<bool, 0, 1> Field_C; + UpdateField<bool, 0, 1> IsDecay; UpdateField<uint32, 0, 2> AnimationDataID; UpdateField<uint32, 0, 3> AnimKitID; UpdateField<uint32, 0, 4> AnimProgress; |