tweak: properly handle no parsed ExtraData

tiltedphoques · Feb 11, 2022 · 1ade122 · 1ade122
1 parent 6b9264f
commit 1ade122
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Code/client/Games/Skyrim/TESObjectREFR.cpp b/Code/client/Games/Skyrim/TESObjectREFR.cpp
@@ -163,7 +163,7 @@ void TESObjectREFR::AddItem(const Container::Entry& arEntry) noexcept
 
     BSExtraDataList* pExtraData = nullptr;
 
-    if (arEntry.ContainsExtraData() && arEntry.ExtraEnchantId.BaseId == 0)
+    if (arEntry.ContainsExtraData())
     {
         pExtraData = Memory::Allocate<BSExtraDataList>();
         pExtraData->data = nullptr;
@@ -183,6 +183,7 @@ void TESObjectREFR::AddItem(const Container::Entry& arEntry) noexcept
         // TODO: deal with temp forms for enchanted items
         if (arEntry.ExtraEnchantId != 0)
         {
+            spdlog::info("Enchanted");
         }
 
         if (arEntry.ExtraHealth > 0.f)
@@ -245,6 +246,12 @@ void TESObjectREFR::AddItem(const Container::Entry& arEntry) noexcept
             pExtraWornLeft->next = nullptr;
             pExtraData->Add(ExtraData::WornLeft, pExtraWornLeft);
         }
+
+        if (pExtraData->data == nullptr)
+        {
+            Memory::Delete(pExtraData);
+            pExtraData = nullptr;
+        }
     }
 
     /*