BauSystem_Main/src/de/steamwar/bausystem/features/tracer/Trace.java

@@ -216,6 +216,10 @@ public class Trace {
      * @return A list of bundles
      */
     private List<List<TNTPoint>> bundleRecords(List<TNTPoint> records, BundleFilter filter) {
+        if (filter == BundleFilter.NONE) {
+            return records.stream().map(List::of).collect(Collectors.toList());
+        }
+
         List<List<TNTPoint>> bundles = new ArrayList<>();
 
         recordsLoop:
@@ -230,15 +234,20 @@ public class Trace {
                 List<TNTPoint> bundle = bundles.get(i);
 
                 Boolean filterResult = filter.function.apply(record, bundle.get(0));
-                if (filterResult == null || !filterResult) {
+                if (filterResult == null) {
                     ArrayList<TNTPoint> newBundle = new ArrayList<>();
                     newBundle.add(record);
                     bundles.add(newBundle);
                     continue recordsLoop;
-                } else {
+                } else if (filterResult) {
                     bundle.add(record);
+                    continue recordsLoop;
                 }
             }
+
+            ArrayList<TNTPoint> newBundle = new ArrayList<>();
+            newBundle.add(record);
+            bundles.add(newBundle);
         }
 
         return bundles;