aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOvahlord <dreadkiller@gmx.de>2024-03-14 22:28:56 +0100
committerOvahlord <dreadkiller@gmx.de>2024-03-14 22:28:56 +0100
commit445be29cc0b3989f92e09ec62e954fbf8dfda057 (patch)
tree5ec32cf486858abeddf8507a54f1d7f357d83905 /src
parent123d515c2e1be7d925d87b35a0f26a9014790a24 (diff)
Core/Packets: fixed SMSG_ITEM_PUSH_RESULT packet structure
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp1
-rw-r--r--src/server/game/Server/Packets/ItemPackets.cpp12
-rw-r--r--src/server/game/Server/Packets/ItemPackets.h4
3 files changed, 0 insertions, 17 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 4f8826af232..fb2b8c0d78e 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -16958,7 +16958,6 @@ void Player::SendQuestUpdateAddItem(ItemTemplate const* itemTemplate, QuestObjec
packet.Quantity = count;
packet.QuantityInInventory = GetQuestObjectiveData(obj);
packet.DisplayText = static_cast<WorldPackets::Item::ItemPushResult::DisplayType>(3);
- packet.Unused_1017 = true;
if (GetGroup() && !itemTemplate->HasFlag(ITEM_FLAG3_DONT_REPORT_LOOT_LOG_TO_PARTY))
GetGroup()->BroadcastPacket(packet.Write(), true);
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<UiEventToast> Toasts;
- Optional<Crafting::CraftingData> CraftingData;
- Optional<uint32> FirstCraftOperationID;
bool Pushed = false;
DisplayType DisplayText = DISPLAY_TYPE_HIDDEN;
bool Created = false;
- bool Unused_1017 = false;
bool IsBonusRoll = false;
bool IsEncounterLoot = false;
};