From da74cfeead1791194b140a61104932ef3ffba18c Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 16 Nov 2023 20:50:54 +0100 Subject: Core/Packets: fixed SMSG_ITEM_PUSH_RESULT packet structure --- src/server/game/Server/Packets/ItemPackets.cpp | 12 ------------ src/server/game/Server/Packets/ItemPackets.h | 4 ---- 2 files changed, 16 deletions(-) (limited to 'src') diff --git a/src/server/game/Server/Packets/ItemPackets.cpp b/src/server/game/Server/Packets/ItemPackets.cpp index ff26b92fd15..010ab6f5a07 100644 --- a/src/server/game/Server/Packets/ItemPackets.cpp +++ b/src/server/game/Server/Packets/ItemPackets.cpp @@ -260,28 +260,16 @@ WorldPacket const* WorldPackets::Item::ItemPushResult::Write() _worldPacket << uint32(BattlePetBreedQuality); _worldPacket << int32(BattlePetLevel); _worldPacket << ItemGUID; - _worldPacket << uint32(Toasts.size()); - for (UiEventToast const& uiEventToast : Toasts) - _worldPacket << uiEventToast; _worldPacket.WriteBit(Pushed); _worldPacket.WriteBit(Created); - _worldPacket.WriteBit(Unused_1017); _worldPacket.WriteBits(DisplayText, 3); _worldPacket.WriteBit(IsBonusRoll); _worldPacket.WriteBit(IsEncounterLoot); - _worldPacket.WriteBit(CraftingData.has_value()); - _worldPacket.WriteBit(FirstCraftOperationID.has_value()); _worldPacket.FlushBits(); _worldPacket << Item; - if (FirstCraftOperationID) - _worldPacket << uint32(*FirstCraftOperationID); - - if (CraftingData) - _worldPacket << *CraftingData; - return &_worldPacket; } diff --git a/src/server/game/Server/Packets/ItemPackets.h b/src/server/game/Server/Packets/ItemPackets.h index b57417a5936..23acbcd3af3 100644 --- a/src/server/game/Server/Packets/ItemPackets.h +++ b/src/server/game/Server/Packets/ItemPackets.h @@ -352,13 +352,9 @@ namespace WorldPackets uint32 BattlePetBreedQuality = 0; int32 BattlePetLevel = 0; ObjectGuid ItemGUID; - std::vector Toasts; - Optional CraftingData; - Optional FirstCraftOperationID; bool Pushed = false; DisplayType DisplayText = DISPLAY_TYPE_HIDDEN; bool Created = false; - bool Unused_1017 = false; bool IsBonusRoll = false; bool IsEncounterLoot = false; }; -- cgit v1.2.3