ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 18:27:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix potential crash in decref.

Browse source
This commit is contained in:
Ottermandias 2023-07-23 16:13:34 +02:00
parent 4f2a14c9ee
commit 96e6ff0fbf
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Penumbra.GameData/Data/EquipmentIdentificationList.cs
View file

@ -48,16 +48,16 @@ internal sealed class EquipmentIdentificationList : KeyList<PseudoEquipItem>
private static IEnumerable<PseudoEquipItem> CreateEquipmentList(ItemData data) private static IEnumerable<PseudoEquipItem> CreateEquipmentList(ItemData data)
{ {
var items = gameData.GetExcelSheet<Item>(language)!; return data.Where(kvp => kvp.Key.IsEquipment() || kvp.Key.IsAccessory())
return items.Where(i => ((EquipSlot)i.EquipSlotCategory.Row).IsEquipmentPiece()) .SelectMany(kvp => kvp.Value)
.Select(i => (PseudoEquipItem)EquipItem.FromArmor(i)) .Select(i => (PseudoEquipItem)i)
.Concat(CustomList); .Concat(CustomList);
} }
private static IEnumerable<PseudoEquipItem> CustomList private static IEnumerable<PseudoEquipItem> CustomList
=> new[] => new[]
{ {
(PseudoEquipItem)EquipItem.FromIds(0, 0, 8100, 0, 1, FullEquipType.Body, "Reaper Shroud"), (PseudoEquipItem)EquipItem.FromIds(0, 0, 8100, 0, 1, FullEquipType.Body, "Reaper Shroud"),
(PseudoEquipItem)EquipItem.FromIds(0, 0, 9041, 0, 1, FullEquipType.Head, "Cid's Bandana (9041)"), (PseudoEquipItem)EquipItem.FromIds(0, 0, 9041, 0, 1, FullEquipType.Head, "Cid's Bandana (9041)"),
(PseudoEquipItem)EquipItem.FromIds(0, 0, 9041, 0, 1, FullEquipType.Body, "Cid's Body (9041)"), (PseudoEquipItem)EquipItem.FromIds(0, 0, 9041, 0, 1, FullEquipType.Body, "Cid's Body (9041)"),
(PseudoEquipItem)EquipItem.FromIds(0, 0, 9903, 0, 1, FullEquipType.Head, "Smallclothes (NPC, 9903)"), (PseudoEquipItem)EquipItem.FromIds(0, 0, 9903, 0, 1, FullEquipType.Head, "Smallclothes (NPC, 9903)"),

12
Penumbra/Interop/ResourceLoading/ResourceLoader.cs
View file

@ -212,8 +212,16 @@ public unsafe class ResourceLoader : IDisposable
if (handle->RefCount != 0) if (handle->RefCount != 0)
return; return;
Penumbra.Log.Error( try
$"[ResourceLoader] Caught decrease of Reference Counter for {handle->FileName()} at 0x{(ulong)handle} below 0."); {
Penumbra.Log.Error(
$"[ResourceLoader] Caught decrease of Reference Counter for {handle->FileName()} at 0x{(ulong)handle} below 0.");
}
catch
{
// ignored
}
returnValue = 1; returnValue = 1;
} }