Gracefully deal with invalid offhand IMCs.

xivdev · Jul 14, 2024 · e46fcc4 · e46fcc4
1 parent d6f61f0
commit e46fcc4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Penumbra.GameData b/Penumbra.GameData
diff --git a/Penumbra/Meta/Manipulations/Imc.cs b/Penumbra/Meta/Manipulations/Imc.cs
@@ -100,7 +100,8 @@ public bool Validate()
                     return false;
                 if (!Enum.IsDefined(ObjectType))
                     return false;
-
+                if (ItemData.AdaptOffhandImc(PrimaryId, out _))
+                    return false;
                 break;
         }
 

diff --git a/Penumbra/Services/ValidityChecker.cs b/Penumbra/Services/ValidityChecker.cs
@@ -45,7 +45,7 @@ public ValidityChecker(IDalamudPluginInterface pi)
     public void LogExceptions()
     {
         if (ImcExceptions.Count > 0)
-            Penumbra.Messager.NotificationMessage($"{ImcExceptions} IMC Exceptions thrown during Penumbra load. Please repair your game files.",
+            Penumbra.Messager.NotificationMessage($"{ImcExceptions.Count} IMC Exceptions thrown during Penumbra load. Please repair your game files.",
                 NotificationType.Warning);
     }