8000 [pull] master from TrinityCore:master by pull[bot] · Pull Request #372 · Mu-L/TrinityCore · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[pull] master from TrinityCore:master #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2025
Merged

[pull] master from TrinityCore:master #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/server/game/Entities/Object/Updates/UpdateFields.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3966,7 +3966,7 @@ void CraftingOrderData::WriteCreate(ByteBuffer& data, Player const* owner, Playe
data << int32(Field_0);
data << uint64(OrderID);
data << int32(SkillLineAbilityID);
data << uint8(OrderState);
data << int32(OrderState);
data << uint8(OrderType);
data << uint8(MinQuality);
data << int64(ExpirationTime);
Expand Down Expand Up @@ -4054,7 +4054,7 @@ void CraftingOrderData::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Pl
}
if (changesMask[5])
{
data << uint8(OrderState);
data << int32(OrderState);
}
}
if (changesMask[6])
Expand Down Expand Up @@ -5726,6 +5726,10 @@ void ActivePlayerData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bo
}
}
}
}
data.FlushBits();
if (changesMask[32])
{
if (changesMask[41])
{
if (!ignoreNestedChangesMask)
Expand All @@ -5734,6 +5738,7 @@ void ActivePlayerData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bo
WriteCompleteDynamicFieldUpdateMask(AccountBankTabSettings.size(), data, 3);
}
}
data.FlushBits();
if (changesMask[0])
{
if (changesMask[10])
Expand Down
2 changes: 1 addition & 1 deletion src/server/game/Entities/Object/Updates/UpdateFields.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,7 +869,7 @@ struct CraftingOrderData : public IsUpdateFieldStructureTag, public HasChangesMa
UpdateField<int32, 0, 2> Field_0;
UpdateField<uint64, 0, 3> OrderID;
UpdateField<int32, 0, 4> SkillLineAbilityID;
UpdateField<uint8, 0, 5> OrderState;
UpdateField<int32, 0, 5> OrderState;
UpdateField<uint8, 6, 7> OrderType;
UpdateField<uint8, 6, 8> MinQuality;
UpdateField<int64, 6, 9> ExpirationTime;
Expand Down
0