Merge branch 'dev'

SlimefunGuguProject · Jan 24, 2025 · f1d7ce2 · f1d7ce2
2 parents 8b33145 + 0b75f02
commit f1d7ce2
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 18 deletions.
diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/util/StorageCacheUtils.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/util/StorageCacheUtils.java
@@ -164,19 +164,30 @@ public static void removeData(Location loc, String key) {
     }
 
     /**
-     * Get universal data from block
+     * Get universal data from location
      *
-     * @param block {@link Block}
+     * @param location {@link Location}
      * @return {@link SlimefunUniversalBlockData}
      */
     @ParametersAreNonnullByDefault
-    @Nullable public static SlimefunUniversalBlockData getUniversalBlock(Block block) {
+    @Nullable public static SlimefunUniversalBlockData getUniversalBlock(Location location) {
         return Slimefun.getDatabaseManager()
                 .getBlockDataController()
-                .getUniversalBlockDataFromCache(block.getLocation())
+                .getUniversalBlockDataFromCache(location)
                 .orElse(null);
     }
 
+    /**
+     * Get universal data from block
+     *
+     * @param block {@link Block}
+     * @return {@link SlimefunUniversalBlockData}
+     */
+    @ParametersAreNonnullByDefault
+    @Nullable public static SlimefunUniversalBlockData getUniversalBlock(Block block) {
+        return getUniversalBlock(block.getLocation());
+    }
+
     /**
      * Get universal menu from block
      *

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/config/SlimefunDatabaseManager.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/config/SlimefunDatabaseManager.java
@@ -162,8 +162,14 @@ public void shutdown() {
             getBlockDataController().shutdown();
         }
 
-        blockStorageAdapter.shutdown();
-        profileAdapter.shutdown();
+        if (blockStorageAdapter != null) {
+            blockStorageAdapter.shutdown();
+        }
+
+        if (profileAdapter != null) {
+            profileAdapter.shutdown();
+        }
+
         ControllerHolder.clearControllers();
     }
 

diff --git a/...io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java b/...io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
@@ -221,7 +221,7 @@ public void onPlayerBreak(BlockBreakEvent e, ItemStack item, List<ItemStack> dro
 
                 if (uniData != null) {
                     if (!e.getPlayer().hasPermission("slimefun.android.bypass")
-                            && !e.getPlayer().getUniqueId().equals(uniData.getData("owner"))) {
+                            && !e.getPlayer().getUniqueId().toString().equals(uniData.getData("owner"))) {
                         // The Player is not allowed to break this android
                         e.setCancelled(true);
                         return;

diff --git a/.../java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ExplosionsListener.java b/.../java/io/github/thebusybiscuit/slimefun4/implementation/listeners/ExplosionsListener.java
@@ -2,6 +2,8 @@
 
 import com.xzavier0722.mc.plugin.slimefun4.storage.callback.IAsyncReadCallback;
 import com.xzavier0722.mc.plugin.slimefun4.storage.controller.SlimefunBlockData;
+import com.xzavier0722.mc.plugin.slimefun4.storage.controller.SlimefunUniversalBlockData;
+import com.xzavier0722.mc.plugin.slimefun4.storage.controller.SlimefunUniversalData;
 import com.xzavier0722.mc.plugin.slimefun4.storage.util.StorageCacheUtils;
 import io.github.thebusybiscuit.slimefun4.api.MinecraftVersion;
 import io.github.thebusybiscuit.slimefun4.api.items.SlimefunItem;
@@ -63,7 +65,9 @@ private void removeResistantBlocks(@Nonnull Iterator<Block> blocks) {
         while (blocks.hasNext()) {
             Block block = blocks.next();
             var loc = block.getLocation();
-            var blockData = StorageCacheUtils.getBlock(loc);
+            var blockData = StorageCacheUtils.hasBlock(loc)
+                    ? StorageCacheUtils.getBlock(loc)
+                    : StorageCacheUtils.getUniversalBlock(loc);
             SlimefunItem item = blockData == null ? null : SlimefunItem.getById(blockData.getSfId());
 
             if (item != null) {
@@ -75,17 +79,31 @@ private void removeResistantBlocks(@Nonnull Iterator<Block> blocks) {
                             if (blockData.isDataLoaded()) {
                                 handleExplosion(handler, block);
                             } else {
-                                controller.loadBlockDataAsync(blockData, new IAsyncReadCallback<>() {
-                                    @Override
-                                    public boolean runOnMainThread() {
-                                        return true;
-                                    }
+                                if (blockData instanceof SlimefunBlockData sbd) {
+                                    controller.loadBlockDataAsync(sbd, new IAsyncReadCallback<>() {
+                                        @Override
+                                        public boolean runOnMainThread() {
+                                            return true;
+                                        }
 
-                                    @Override
-                                    public void onResult(SlimefunBlockData result) {
-                                        handleExplosion(handler, block);
-                                    }
-                                });
+                                        @Override
+                                        public void onResult(SlimefunBlockData result) {
+                                            handleExplosion(handler, block);
+                                        }
+                                    });
+                                } else if (blockData instanceof SlimefunUniversalBlockData ubd) {
+                                    controller.loadUniversalDataAsync(ubd, new IAsyncReadCallback<>() {
+                                        @Override
+                                        public boolean runOnMainThread() {
+                                            return true;
+                                        }
+
+                                        @Override
+                                        public void onResult(SlimefunUniversalData result) {
+                                            handleExplosion(handler, block);
+                                        }
+                                    });
+                                }
                             }
                         })) {
                     controller.removeBlock(loc);