diff options
| -rw-r--r-- | src/server/game/Entities/Object/Updates/UpdateFields.cpp | 40 | ||||
| -rw-r--r-- | src/server/game/Entities/Object/Updates/UpdateFields.h | 24 |
2 files changed, 32 insertions, 32 deletions
diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.cpp b/src/server/game/Entities/Object/Updates/UpdateFields.cpp index 0b84703010d..74a6877bbfe 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.cpp +++ b/src/server/game/Entities/Object/Updates/UpdateFields.cpp @@ -1956,7 +1956,7 @@ void PlayerData::WriteCreate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVi void PlayerData::WriteUpdate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags, Player const* owner, Player const* receiver) const { - Mask allowedMaskForTarget({ 0xFFFFFFFFu, 0x000000FFu, 0xFFFFFFFCu, 0x0001FFFFu }); + Mask allowedMaskForTarget({ 0xFFFFFFFFu, 0x000003FFu, 0xFFFFFFF0u, 0x0007FFFFu }); AppendAllowedFieldsMaskForFlag(allowedMaskForTarget, fieldVisibilityFlags); WriteUpdate(data, _changesMask & allowedMaskForTarget, false, owner, receiver); } @@ -1964,12 +1964,12 @@ void PlayerData::WriteUpdate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVi void PlayerData::AppendAllowedFieldsMaskForFlag(Mask& allowedMaskForTarget, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags) { if (fieldVisibilityFlags.HasFlag(UpdateFieldFlag::PartyMember)) - allowedMaskForTarget |= { 0x00000000u, 0xFFFFFF00u, 0x00000003u, 0x00000000u }; + allowedMaskForTarget |= { 0x00000000u, 0xFFFFFC00u, 0x0000000Fu, 0x00000000u }; } void PlayerData::FilterDisallowedFieldsMaskForFlag(Mask& changesMask, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags) { - Mask allowedMaskForTarget({ 0xFFFFFFFFu, 0x000000FFu, 0xFFFFFFFCu, 0x0001FFFFu }); + Mask allowedMaskForTarget({ 0xFFFFFFFFu, 0x000003FFu, 0xFFFFFFF0u, 0x0007FFFFu }); AppendAllowedFieldsMaskForFlag(allowedMaskForTarget, fieldVisibilityFlags); changesMask &= allowedMaskForTarget; } @@ -2550,6 +2550,21 @@ void PVPInfo::ClearChangesMask() _changesMask.ResetAll(); } +void Research::WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const +{ + data << int16(ResearchProjectID); +} + +void Research::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const* owner, Player const* receiver) const +{ + data << int16(ResearchProjectID); +} + +bool Research::operator==(Research const& right) const +{ + return ResearchProjectID == right.ResearchProjectID; +} + void CharacterRestriction::WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const { data << int32(Field_0); @@ -3032,21 +3047,6 @@ void StableInfo::ClearChangesMask() _changesMask.ResetAll(); } -void Research::WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const -{ - data << int16(ResearchProjectID); -} - -void Research::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const* owner, Player const* receiver) const -{ - data << int16(ResearchProjectID); -} - -bool Research::operator==(Research const& right) const -{ - return ResearchProjectID == right.ResearchProjectID; -} - void ActivePlayerData::WriteCreate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> fieldVisibilityFlags, Player const* owner, Player const* receiver) const { for (uint32 i = 0; i < 141; ++i) @@ -5155,7 +5155,6 @@ void SceneObjectData::ClearChangesMask() void ConversationLine::WriteCreate(ByteBuffer& data, Conversation const* owner, Player const* receiver) const { data << int32(ConversationLineID); - data << int32(BroadcastTextID); data << uint32(ViewerDependentValue<StartTimeTag>::GetValue(this, owner, receiver)); data << int32(UiCameraID); data << uint8(ActorIndex); @@ -5165,7 +5164,6 @@ void ConversationLine::WriteCreate(ByteBuffer& data, Conversation const* owner, void ConversationLine::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Conversation const* owner, Player const* receiver) const { data << int32(ConversationLineID); - data << int32(BroadcastTextID); data << uint32(ViewerDependentValue<StartTimeTag>::GetValue(this, owner, receiver)); data << int32(UiCameraID); data << uint8(ActorIndex); @@ -5175,7 +5173,6 @@ void ConversationLine::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Con bool ConversationLine::operator==(ConversationLine const& right) const { return ConversationLineID == right.ConversationLineID - && BroadcastTextID == right.BroadcastTextID && StartTime == right.StartTime && UiCameraID == right.UiCameraID && ActorIndex == right.ActorIndex @@ -5296,6 +5293,7 @@ void ConversationData::ClearChangesMask() Base::ClearChangesMask(LastLineEndTime); _changesMask.ResetAll(); } + } #if TRINITY_COMPILER == TRINITY_COMPILER_GNU diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h index 6034250e307..cfc51d4d0fb 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.h +++ b/src/server/game/Entities/Object/Updates/UpdateFields.h @@ -31,6 +31,8 @@ // This file is automatically generated, DO NOT EDIT class AreaTrigger; +class AzeriteEmpoweredItem; +class AzeriteItem; class Bag; class ByteBuffer; class Conversation; @@ -503,6 +505,16 @@ struct PVPInfo : public IsUpdateFieldStructureTag, public HasChangesMask<19> void ClearChangesMask(); }; +struct Research : public IsUpdateFieldStructureTag +{ + int16 ResearchProjectID; + + void WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const; + void WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const* owner, Player const* receiver) const; + bool operator==(Research const& right) const; + bool operator!=(Research const& right) const { return !(*this == right); } +}; + struct CharacterRestriction : public IsUpdateFieldStructureTag { int32 Field_0; @@ -638,16 +650,6 @@ struct StableInfo : public IsUpdateFieldStructureTag, public HasChangesMask<3> void ClearChangesMask(); }; -struct Research : public IsUpdateFieldStructureTag -{ - int16 ResearchProjectID; - - void WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const; - void WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const* owner, Player const* receiver) const; - bool operator==(Research const& right) const; - bool operator!=(Research const& right) const { return !(*this == right); } -}; - struct ActivePlayerData : public IsUpdateFieldStructureTag, public HasChangesMask<1369> { UpdateField<bool, 0, 1> SortBagsRightToLeft; @@ -929,7 +931,6 @@ struct SceneObjectData : public IsUpdateFieldStructureTag, public HasChangesMask struct ConversationLine : public IsUpdateFieldStructureTag { int32 ConversationLineID; - int32 BroadcastTextID; uint32 StartTime; struct StartTimeTag : ViewerDependentValueTag<uint32> {}; int32 UiCameraID; @@ -968,6 +969,7 @@ struct ConversationData : public IsUpdateFieldStructureTag, public HasChangesMas void WriteUpdate(ByteBuffer& data, Mask const& changesMask, bool ignoreNestedChangesMask, Conversation const* owner, Player const* receiver) const; void ClearChangesMask(); }; + } #endif // UpdateFields_h__ |