fix: fix unidata loading order

SlimefunGuguProject · Feb 7, 2025 · 66ec3df · 66ec3df
1 parent f7424d1
commit 66ec3df
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/BlockDataController.java b/...main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/BlockDataController.java
@@ -250,6 +250,8 @@ public SlimefunUniversalBlockData createUniversalBlock(Location l, String sfId)
 
         uniData.initLastPresent();
 
+        uniData.setIsDataLoaded(true);
+
         loadedUniversalData.put(uuid, uniData);
 
         var preset = UniversalMenuPreset.getPreset(sfId);
@@ -265,8 +267,6 @@ public SlimefunUniversalBlockData createUniversalBlock(Location l, String sfId)
                 .getBlockDataController()
                 .saveUniversalData(uuid, sfId, Set.of(UniversalDataTrait.BLOCK, UniversalDataTrait.INVENTORY));
 
-        uniData.setIsDataLoaded(true);
-
         return uniData;
     }
 
@@ -862,6 +862,8 @@ public void loadUniversalData(SlimefunUniversalData uniData) {
 
             loadedUniversalData.putIfAbsent(uniData.getUUID(), uniData);
 
+            uniData.setIsDataLoaded(true);
+
             if (uniData.hasTrait(UniversalDataTrait.INVENTORY)) {
                 var menuPreset = UniversalMenuPreset.getPreset(uniData.getSfId());
                 if (menuPreset != null) {
@@ -903,8 +905,6 @@ public void loadUniversalData(SlimefunUniversalData uniData) {
                                     uniData.getUUID());
                 }
             }
-
-            uniData.setIsDataLoaded(true);
         } finally {
             lock.unlock(key);
         }