From 36448c7d080fb5768f8a8444a9875be597d28745 Mon Sep 17 00:00:00 2001
From: Le Duc Anh <ptitducanh@gmail.com>
Date: Thu, 19 Feb 2026 19:10:31 +0700
Subject: [PATCH] make sure bundle is loaded first

---
 Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs b/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
index 7662dd2d31..e506ea9575 100644
--- a/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
+++ b/Assets/PerfectWorld/Scripts/Addressable/AddressableManager.cs
@@ -128,14 +128,15 @@ namespace BrewMonster.Scripts
 
             if (_loadedPrefabAssets.ContainsKey(assetPath))
             {
+                BMLogger.Log($"AddressableManager: Asset already loaded: {assetPath} is valid: (${_loadedPrefabAssets[assetPath].Result != null})");
                 return _loadedPrefabAssets[assetPath].Result;
             }
 
             try
             {
                 var handle = Addressables.LoadAssetAsync<GameObject>(assetPath);
-                _loadedPrefabAssets[assetPath] = handle;
                 await handle.Task;
+                _loadedPrefabAssets[assetPath] = handle;
                 return handle.Result;
             }
             catch (System.Exception e)