Only show items with an existing draw object

PassiveModding · Oct 27, 2023 · 64a8bc3 · 64a8bc3
1 parent 9336b58
commit 64a8bc3
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/Meddle/Meddle.Plugin/UI/ResourceTab.cs b/Meddle/Meddle.Plugin/UI/ResourceTab.cs
@@ -125,7 +125,9 @@ private void DrawObjectPicker()
             .Where(x =>
                 x.ObjectKind is ObjectKind.Player or ObjectKind.BattleNpc or ObjectKind.Retainer or ObjectKind.EventNpc
                     or ObjectKind.Companion
-            ).ToArray();
+            )
+            .Where(x => CharacterUtility.HasDrawObject(x.ObjectIndex, Service.ObjectTable))
+            .ToArray();
         if (objects.Length == 0)
         {
             ImGui.Text("No game objects found");
@@ -152,7 +154,15 @@ or ObjectKind.Companion
                 }
             }
 
-            var names = objects.Select(x => $"{x.Name} - {x.ObjectKind}").ToArray();
+            var names = objects.Select(x =>
+            {
+                var name = x.Name?.ToString();
+                if (string.IsNullOrEmpty(name))
+                {
+                    name = x.ObjectIndex.ToString();
+                }
+                return $"{name} - {x.ObjectKind}";
+            }).ToArray();
 
             if (selected == -1 && names.Length > 0)
             {

diff --git a/Meddle/Meddle.Xande/Utility/CharacterUtility.cs b/Meddle/Meddle.Xande/Utility/CharacterUtility.cs
@@ -25,6 +25,26 @@ public static class CharacterUtility
         return orderedPaths.FirstOrDefault() ?? suspectedPath;
     }
 
+    public static unsafe bool HasDrawObject(ushort gameObjectId, IObjectTable objectTable)
+    {
+        var characters = objectTable.OfType<Character>();
+
+        var match = characters.FirstOrDefault(x => x.ObjectIndex == gameObjectId);
+        if (match == null || !match.IsValid())
+        {
+            return false;
+        }
+
+        var gameObject = (GameObject*) match.Address;
+        var drawObject = gameObject->GetDrawObject();
+        if (drawObject == null)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
     public static unsafe Models.Character? GetCharacterInfo(ushort gameObjectId, IObjectTable objectTable, LuminaManager lumina)
     {
         var characters = objectTable.OfType<Character>();