feat: rewrite the logic of full-random mode

jlxnb · Jan 21, 2025 · c4e25be · c4e25be
1 parent 2151bd0
commit c4e25be
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/src/main/java/org/eu/pcraft/powerfulfireworks/utils/scheduler/RandomFireworkNode.java b/src/main/java/org/eu/pcraft/powerfulfireworks/utils/scheduler/RandomFireworkNode.java
@@ -25,21 +25,18 @@ protected Pair<Double> getDoubleInterval(Map<String, Object> section, String key
     }
     @Override
     protected void load(FireworkScheduler scheduler, Map<String, Object> section) {
-        this.full = (boolean) section.getOrDefault("full", false);  // enable full random mode
-        if (!this.full) {
-            // presets
-            List<String> pr = (List<String>) section.get("presets");
-            if (pr != null) {
-                for (String s : pr) {
-                    ItemStack p = scheduler.getPreset(s);
-                    if (p == null)
-                        throw new IllegalArgumentException("preset " + s);
-                    presets.add(p);
+        // presets
+        List<String> pr = (List<String>) section.get("presets");
+        if (pr != null) {
+            for (String s : pr) {
+                ItemStack p = scheduler.getPreset(s);
+                   if (p == null)
+                       throw new IllegalArgumentException("preset " + s);
+                   presets.add(p);
                 }
-            }
-            single = this.presets.size() != 1;
         }
-
+        single = this.presets.size() == 1;
+        this.full = this.presets.isEmpty();
         this.count = (int) section.getOrDefault("count", 1);
         this.X = getDoubleInterval(section,"X");
         this.Y = getDoubleInterval(section,"Y");