Core/PacketIO: Named a bunch of unknown/unused fields

1 files changed, 8 insertions, 8 deletions

diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
index 3aa347b7457..7e94cb7a1a2 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -50,7 +50,7 @@ enum eAuctionHouse
 
 AuctionsBucketKey::AuctionsBucketKey(WorldPackets::AuctionHouse::AuctionBucketKey const& key) :
     ItemId(key.ItemID), ItemLevel(key.ItemLevel), BattlePetSpeciesId(key.BattlePetSpeciesID.value_or(0)),
-    SuffixItemNameDescriptionId(key.SuffixItemNameDescriptionID.value_or(0))
+    SuffixItemNameDescriptionId(key.ItemSuffix.value_or(0))
 {
 }
 
@@ -109,6 +109,10 @@ void AuctionsBucketData::BuildBucketInfo(WorldPackets::AuctionHouse::BucketInfo*
                 bucketInfo->MaxBattlePetQuality = bucketInfo->MaxBattlePetQuality ? std::max(*bucketInfo->MaxBattlePetQuality, quality) : quality;
                 bucketInfo->MaxBattlePetLevel = bucketInfo->MaxBattlePetLevel ? std::max(*bucketInfo->MaxBattlePetLevel, level) : level;
                 bucketInfo->BattlePetBreedID = breedId;
+                if (!bucketInfo->BattlePetLevelMask)
+                    bucketInfo->BattlePetLevelMask = 0;
+
+                *bucketInfo->BattlePetLevelMask |= 1 << (level - 1);
             }
         }
 
@@ -864,13 +868,11 @@ AuctionPosting* AuctionHouseObject::GetAuction(uint32 auctionId)
 void AuctionHouseObject::AddAuction(CharacterDatabaseTransaction trans, AuctionPosting auction)
 {
     AuctionsBucketKey key = AuctionsBucketKey::ForItem(auction.Items[0]);
-    AuctionsBucketData* bucket;
-    auto bucketItr = _buckets.find(key);
-    if (bucketItr == _buckets.end())
+    auto [bucketItr, isNew] = _buckets.try_emplace(key);
+    AuctionsBucketData* bucket = &bucketItr->second;
+    if (isNew)
     {
         // we don't have any item for this key yet, create new bucket
-        bucketItr = _buckets.emplace(std::piecewise_construct, std::forward_as_tuple(key), std::forward_as_tuple()).first;
-        bucket = &bucketItr->second;
         bucket->Key = key;
 
         ItemTemplate const* itemTemplate = auction.Items[0]->GetTemplate();
@@ -917,8 +919,6 @@ void AuctionHouseObject::AddAuction(CharacterDatabaseTransaction trans, AuctionP
             bucket->FullName[locale] = wstrCaseAccentInsensitiveParse(utf16name, locale);
         }
     }
-    else
-        bucket = &bucketItr->second;
 
     // update cache fields
     uint64 priceToDisplay = auction.BuyoutOrUnitPrice ? auction.BuyoutOrUnitPrice : auction.BidAmount;