From c7713985feecec279f2f1ab379ed4a7c3a1aa328 Mon Sep 17 00:00:00 2001
From: takararei <33062228+takararei@users.noreply.github.com>
Date: Mon, 29 Jun 2026 11:51:52 +0800
Subject: [PATCH] Improve entry validation in AddressableImporter

Added check for 'zombie entry' in AddressableImporter.
---
 Editor/AddressableImporter.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Editor/AddressableImporter.cs b/Editor/AddressableImporter.cs
index 2813ca0..385b560 100644
--- a/Editor/AddressableImporter.cs
+++ b/Editor/AddressableImporter.cs
@@ -246,7 +246,11 @@ static AddressableAssetEntry CreateOrUpdateAddressableAssetEntry(
         // CreateOrMoveEntry is very slow, so don't move anything if the group is already the correct one
         var guid = AssetDatabase.AssetPathToGUID(assetPath);
         var entry = settings.FindAssetEntry(guid);
-        if (entry == null || entry.parentGroup != group)
+        // When manually removing an entry from the Addressables Groups window,
+        // it may remain in settings' GUID→Entry map but be removed from the group's entries list
+        // (a "zombie entry"). Check that the entry is actually present in the group before skipping CreateOrMoveEntry.
+        var isInGroup = entry != null && entry.parentGroup != null && entry.parentGroup.entries.Contains(entry);
+        if (entry == null || entry.parentGroup != group || !isInGroup)
             entry = settings.CreateOrMoveEntry(guid, group);
 
         if (entry != null)