fix: CobbleGen ignored filter

null2264 · Sep 3, 2023 · 0e64f07 · 0e64f07
1 parent 4b8de9e
commit 0e64f07
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/main/java/io/github/null2264/cobblegen/data/model/BuiltInGenerator.java b/src/main/java/io/github/null2264/cobblegen/data/model/BuiltInGenerator.java
@@ -25,10 +25,6 @@ private String randomizeBlockId(Block key, String dim, Integer yLevel) {
                 getOutput().getOrDefault("*", List.of())
         );
 
-        if (blockIds.isEmpty()) return null;
-
-        if (blockIds.size() == 1) return blockIds.get(0).id;
-
         ArrayList<WeightedBlock> filteredBlockIds = new ArrayList<>();
         AtomicReference<Double> totalWeight = new AtomicReference<>(0.0);
 
@@ -53,13 +49,16 @@ private String randomizeBlockId(Block key, String dim, Integer yLevel) {
             }
         }
 
+        if (filteredBlockIds.isEmpty()) return null;
+
+        if (filteredBlockIds.size() == 1) return filteredBlockIds.get(0).id;
+
         int idx = 0;
         for (double r = Math.random() * totalWeight.get(); idx < filteredBlockIds.size() - 1; ++idx) {
             r -= filteredBlockIds.get(idx).weight;
             if (r <= 0.0) break;
         }
 
-        if (filteredBlockIds.isEmpty()) return null;
         return filteredBlockIds.get(idx).id;
     }