mirror of
https://github.com/DorkSquadRR/DorkNet.git
synced 2026-10-25 23:18:44 -07:00
feat: Update gift handling to ensure AvatarItemDesc matches v4/items format; prevent duplicate wardrobe entries
This commit is contained in:
@@ -247,6 +247,12 @@ public class AvatarGiftsController(
|
||||
// empty list rather than 500.
|
||||
if (!string.IsNullOrEmpty(gift.AvatarItemDescOrHairDyeDesc))
|
||||
{
|
||||
// Inventory stores the BARE guid ("guid"), but a gift now carries
|
||||
// the 4-part wire desc ("guid,,,") so its post-consume unlock
|
||||
// matches api/avatar/v4/items. Normalise to the inventory form
|
||||
// here or we'd store "guid,,," alongside the bare "guid" a direct
|
||||
// purchase already added → a duplicate wardrobe row.
|
||||
var invDesc = StoreService.InventoryAvatarItemDesc(gift.AvatarItemDescOrHairDyeDesc);
|
||||
var avatar = await db.Avatars.FirstOrDefaultAsync(a => a.PlayerId == pid);
|
||||
if (avatar is null)
|
||||
{
|
||||
@@ -257,17 +263,16 @@ public class AvatarGiftsController(
|
||||
{
|
||||
var list = System.Text.Json.JsonSerializer
|
||||
.Deserialize<List<string>>(avatar.InventoryJson) ?? new();
|
||||
if (!list.Contains(gift.AvatarItemDescOrHairDyeDesc))
|
||||
if (!list.Contains(invDesc))
|
||||
{
|
||||
list.Add(gift.AvatarItemDescOrHairDyeDesc);
|
||||
list.Add(invDesc);
|
||||
avatar.InventoryJson = System.Text.Json.JsonSerializer.Serialize(list);
|
||||
avatar.UpdatedAt = DateTime.UtcNow;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
avatar.InventoryJson = System.Text.Json.JsonSerializer.Serialize(
|
||||
new[] { gift.AvatarItemDescOrHairDyeDesc });
|
||||
avatar.InventoryJson = System.Text.Json.JsonSerializer.Serialize(new[] { invDesc });
|
||||
avatar.UpdatedAt = DateTime.UtcNow;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -110,12 +110,21 @@ public class StorefrontsBuyController(
|
||||
inventoryAvatarDesc = hairDyeColorGuid;
|
||||
consumableItemDesc = hairDyeConsumableDesc;
|
||||
}
|
||||
// The client matches this gift's item against api/avatar/v4/items by
|
||||
// EXACT AvatarItemDesc string in OutfitManager.UnlockAvatarItemAndMarkNew
|
||||
// (fired after the buyer consumes the post-purchase gift box). v4/items
|
||||
// emits outfit items as the 4-part "{guid},,," desc (the bare guid
|
||||
// crashes the client's AvatarItem parser), so the gift must carry the
|
||||
// SAME 4-part desc — sending the stripped bare guid made Find() miss and
|
||||
// NRE, which surfaced as items vanishing on every buy. Hair dyes match
|
||||
// by their bare colour guid (inventoryAvatarDesc), unchanged.
|
||||
var giftWireDesc = string.IsNullOrEmpty(avatarItemDesc) ? inventoryAvatarDesc : avatarItemDesc;
|
||||
var gift = new GiftPackageEntity
|
||||
{
|
||||
RecipientPlayerId = recipient,
|
||||
FromPlayerId = isGift && !giftTarget!.Anonymous ? (int?)pid : null,
|
||||
AvatarItemType = string.IsNullOrEmpty(inventoryAvatarDesc) ? null : avatarItemType,
|
||||
AvatarItemDescOrHairDyeDesc = inventoryAvatarDesc,
|
||||
AvatarItemType = string.IsNullOrEmpty(giftWireDesc) ? null : avatarItemType,
|
||||
AvatarItemDescOrHairDyeDesc = giftWireDesc,
|
||||
ConsumableItemDesc = consumableItemDesc,
|
||||
EquipmentPrefabName = equipmentPrefabName,
|
||||
EquipmentModificationGuid = equipmentModificationGuid,
|
||||
|
||||
Reference in New Issue
Block a user