diff options
Diffstat (limited to 'src')
13 files changed, 28 insertions, 21 deletions
diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 1aa72e10f66..1dff5311003 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -667,7 +667,6 @@ void WorldSession::SendListInventory(ObjectGuid vendorGuid) price -= CalculatePct(price, priceMod); item.MuID = slot + 1; // client expects counting to start at 1 - item.Durability = itemTemplate->MaxDurability; item.ExtendedCostID = vendorItem->ExtendedCost; item.Type = vendorItem->Type; item.Quantity = leftInStock; diff --git a/src/server/game/Server/Packets/AuctionHousePackets.cpp b/src/server/game/Server/Packets/AuctionHousePackets.cpp index e1b1ed5a0ac..9b5bc832e84 100644 --- a/src/server/game/Server/Packets/AuctionHousePackets.cpp +++ b/src/server/game/Server/Packets/AuctionHousePackets.cpp @@ -628,18 +628,22 @@ WorldPacket const* AuctionListBucketsResult::Write() WorldPacket const* AuctionListItemsResult::Write() { - _worldPacket << uint32(Items.size()); - _worldPacket << uint32(Unknown830); - _worldPacket << uint32(TotalCount); - _worldPacket << uint32(DesiredDelay); - _worldPacket.WriteBits(AsUnderlyingType(ListType), 2); - _worldPacket.WriteBit(HasMoreResults); - _worldPacket.FlushBits(); + { + _worldPacket << uint32(Items.size()); + _worldPacket << uint32(Unknown830); + _worldPacket << uint32(DesiredDelay); + for (AuctionItem const& item : Items) + _worldPacket << item; + } - _worldPacket << BucketKey; + { + _worldPacket.WriteBits(AsUnderlyingType(ListType), 2); + _worldPacket.WriteBit(HasMoreResults); + _worldPacket.FlushBits(); - for (AuctionItem const& item : Items) - _worldPacket << item; + _worldPacket << BucketKey; + _worldPacket << uint32(TotalCount); + } return &_worldPacket; } diff --git a/src/server/game/Server/Packets/ChannelPackets.cpp b/src/server/game/Server/Packets/ChannelPackets.cpp index 3ab652c91ba..56a7b25437f 100644 --- a/src/server/game/Server/Packets/ChannelPackets.cpp +++ b/src/server/game/Server/Packets/ChannelPackets.cpp @@ -115,7 +115,7 @@ WorldPacket const* WorldPackets::Channel::UserlistUpdate::Write() _worldPacket << UpdatedUserGUID; _worldPacket << uint8(UserFlags); _worldPacket << uint32(_ChannelFlags); - _worldPacket << uint32(ChannelID); + _worldPacket << int32(ChannelID); _worldPacket.WriteBits(ChannelName.length(), 7); _worldPacket.FlushBits(); _worldPacket.WriteString(ChannelName); diff --git a/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp b/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp index 58351ab5790..5b4f0e4f38a 100644 --- a/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp +++ b/src/server/game/Server/Packets/CombatLogPacketsCommon.cpp @@ -94,6 +94,8 @@ ByteBuffer& operator<<(ByteBuffer& data, SpellCastLogData const& spellCastLogDat data << int32(spellCastLogData.AttackPower); data << int32(spellCastLogData.SpellPower); data << int32(spellCastLogData.Armor); + data << int32(spellCastLogData.Unknown_1105_1); + data << int32(spellCastLogData.Unknown_1105_2); data << BitsSize<9>(spellCastLogData.PowerData); data.FlushBits(); diff --git a/src/server/game/Server/Packets/CombatLogPacketsCommon.h b/src/server/game/Server/Packets/CombatLogPacketsCommon.h index fe8f5285158..0f438ea197a 100644 --- a/src/server/game/Server/Packets/CombatLogPacketsCommon.h +++ b/src/server/game/Server/Packets/CombatLogPacketsCommon.h @@ -43,6 +43,8 @@ namespace WorldPackets int32 AttackPower = 0; int32 SpellPower = 0; int32 Armor = 0; + int32 Unknown_1105_1 = 0; + int32 Unknown_1105_2 = 0; std::vector<SpellLogPowerData> PowerData; void Initialize(Unit const* unit); diff --git a/src/server/game/Server/Packets/ItemPackets.cpp b/src/server/game/Server/Packets/ItemPackets.cpp index abe16246c7a..f3a2b2ed277 100644 --- a/src/server/game/Server/Packets/ItemPackets.cpp +++ b/src/server/game/Server/Packets/ItemPackets.cpp @@ -48,7 +48,7 @@ WorldPacket const* WorldPackets::Item::BuyFailed::Write() { _worldPacket << VendorGUID; _worldPacket << uint32(Muid); - _worldPacket << uint8(Reason); + _worldPacket << int32(Reason); return &_worldPacket; } diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp index ccd6ac9a11f..b963aa51dd9 100644 --- a/src/server/game/Server/Packets/MovementPackets.cpp +++ b/src/server/game/Server/Packets/MovementPackets.cpp @@ -1011,7 +1011,7 @@ WorldPacket const* WorldPackets::Movement::ResumeToken::Write() ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Movement::MoveSetCompoundState::MoveStateChange const& stateChange) { - data << uint16(stateChange.MessageID); + data << uint32(stateChange.MessageID); data << uint32(stateChange.SequenceIndex); data.WriteBit(stateChange.Speed.has_value()); data.WriteBit(stateChange.SpeedRange.has_value()); diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h index 1ed4e1d70d5..72d76e15140 100644 --- a/src/server/game/Server/Packets/MovementPackets.h +++ b/src/server/game/Server/Packets/MovementPackets.h @@ -667,7 +667,7 @@ namespace WorldPackets { MoveStateChange(OpcodeServer messageId, uint32 sequenceIndex) : MessageID(messageId), SequenceIndex(sequenceIndex) { } - uint16 MessageID = 0; + uint32 MessageID = 0; uint32 SequenceIndex = 0; Optional<float> Speed; Optional<MoveSetCompoundState::SpeedRange> SpeedRange; diff --git a/src/server/game/Server/Packets/NPCPackets.cpp b/src/server/game/Server/Packets/NPCPackets.cpp index 390fd319753..64b6d341bea 100644 --- a/src/server/game/Server/Packets/NPCPackets.cpp +++ b/src/server/game/Server/Packets/NPCPackets.cpp @@ -143,7 +143,6 @@ ByteBuffer& operator<<(ByteBuffer& data, VendorItem const& item) data << uint64(item.Price); data << uint32(item.MuID); data << int32(item.Type); - data << int32(item.Durability); data << int32(item.StackCount); data << int32(item.Quantity); data << int32(item.ExtendedCostID); @@ -161,7 +160,7 @@ ByteBuffer& operator<<(ByteBuffer& data, VendorItem const& item) WorldPacket const* VendorInventory::Write() { _worldPacket << Vendor; - _worldPacket << uint8(Reason); + _worldPacket << int32(Reason); _worldPacket << uint32(Items.size()); for (VendorItem const& item : Items) _worldPacket << item; diff --git a/src/server/game/Server/Packets/NPCPackets.h b/src/server/game/Server/Packets/NPCPackets.h index 526f1c1432c..1c2ba53fe12 100644 --- a/src/server/game/Server/Packets/NPCPackets.h +++ b/src/server/game/Server/Packets/NPCPackets.h @@ -170,7 +170,6 @@ namespace WorldPackets WorldPackets::Item::ItemInstance Item; int32 Quantity = -1; uint64 Price = 0; - int32 Durability = 0; int32 StackCount = 0; int32 ExtendedCostID = 0; int32 PlayerConditionFailed = 0; @@ -186,7 +185,7 @@ namespace WorldPackets WorldPacket const* Write() override; - uint8 Reason = 0; + int32 Reason = 0; std::vector<VendorItem> Items; ObjectGuid Vendor; }; diff --git a/src/server/game/Server/Packets/PerksProgramPacketsCommon.cpp b/src/server/game/Server/Packets/PerksProgramPacketsCommon.cpp index 32d0d781c94..e5b53bc3670 100644 --- a/src/server/game/Server/Packets/PerksProgramPacketsCommon.cpp +++ b/src/server/game/Server/Packets/PerksProgramPacketsCommon.cpp @@ -30,7 +30,8 @@ ByteBuffer& operator<<(ByteBuffer& data, PerksVendorItem const& perksVendorItem) data << int32(perksVendorItem.Field_18); data << int32(perksVendorItem.Price); data << perksVendorItem.AvailableUntil; - data.WriteBit(perksVendorItem.Disabled); + data << Bits<1>(perksVendorItem.Disabled); + data << Bits<1>(perksVendorItem.Field_41); data.FlushBits(); return data; diff --git a/src/server/game/Server/Packets/PerksProgramPacketsCommon.h b/src/server/game/Server/Packets/PerksProgramPacketsCommon.h index 7b153218e8b..cd676002bdb 100644 --- a/src/server/game/Server/Packets/PerksProgramPacketsCommon.h +++ b/src/server/game/Server/Packets/PerksProgramPacketsCommon.h @@ -34,6 +34,7 @@ struct PerksVendorItem int32 Price = 0; Timestamp<> AvailableUntil; bool Disabled = false; + bool Field_41 = false; }; ByteBuffer& operator<<(ByteBuffer& data, PerksVendorItem const& perksVendorItem); diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h index 42eaa3e657d..b481d19f685 100644 --- a/src/server/game/Server/Packets/SpellPackets.h +++ b/src/server/game/Server/Packets/SpellPackets.h @@ -969,7 +969,7 @@ namespace WorldPackets ObjectGuid Guid; ObjectGuid CastID; - uint16 MoveMsgID = 0; + uint32 MoveMsgID = 0; int32 SpellID = 0; float Pitch = 0.0f; float Speed = 0.0f; |