Update BlockDataService.java

更优雅的写法且性能大致不差
mcchampions · Dec 8, 2024 · f09e64e · f09e64e
1 parent 4ae7580
commit f09e64e
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BlockDataService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/BlockDataService.java
@@ -119,29 +119,26 @@ public Optional<UUID> getUniversalDataUUID(Block b) {
     }
 
     public static Optional<String> getBlockData(Block b, NamespacedKey key) {
-        try {
+        if (Bukkit.isPrimaryThread()) {
             BlockState state = b.getState(false);
             PersistentDataContainer container = getPersistentDataContainer(state);
-            if (container != null) {
-                return Optional.ofNullable(container.get(key, PersistentDataType.STRING));
-            } else {
+            if (container == null) {
                 return Optional.empty();
             }
-        } catch (IllegalStateException e) {
-            try {
-                return Bukkit.getScheduler().callSyncMethod(Slimefun.instance(), () -> {
-                    BlockState state = b.getState(false);
-                    PersistentDataContainer container = getPersistentDataContainer(state);
-                    if (container != null) {
-                        return Optional.ofNullable(container.get(key, PersistentDataType.STRING));
-                    } else {
-                        //noinspection OptionalOfNullableMisuse
-                        return Optional.ofNullable((String) null);
-                    }
-                }).get();
-            } catch (InterruptedException | ExecutionException ex) {
-                throw new RuntimeException(ex);
-            }
+            return Optional.ofNullable(container.get(key, PersistentDataType.STRING));
+        }
+        try {
+            return Bukkit.getScheduler().callSyncMethod(Slimefun.instance(), () -> {
+                BlockState state = b.getState(false);
+                PersistentDataContainer container = getPersistentDataContainer(state);
+                if (container == null) {
+                    //noinspection OptionalOfNullableMisuse
+                    return Optional.ofNullable((String) null);
+                }
+                return Optional.ofNullable(container.get(key, PersistentDataType.STRING));
+            }).get();
+        } catch (InterruptedException | ExecutionException ex) {
+            throw new RuntimeException(ex);
         }
     }