From 8b07e93a706c072218f2667675cdca0520fe83c1 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Thu, 18 Apr 2024 17:25:47 +0200 Subject: [PATCH] Fix Trace.bundleRecords --- .../steamwar/bausystem/features/tracer/Trace.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/Trace.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/Trace.java index 0d61771e..b0313b8e 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/Trace.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/Trace.java @@ -216,6 +216,10 @@ public class Trace { * @return A list of bundles */ private List> bundleRecords(List records, BundleFilter filter) { + if (filter == BundleFilter.NONE) { + return records.stream().map(List::of).collect(Collectors.toList()); + } + List> bundles = new ArrayList<>(); recordsLoop: @@ -230,15 +234,20 @@ public class Trace { List bundle = bundles.get(i); Boolean filterResult = filter.function.apply(record, bundle.get(0)); - if (filterResult == null || !filterResult) { + if (filterResult == null) { ArrayList newBundle = new ArrayList<>(); newBundle.add(record); bundles.add(newBundle); continue recordsLoop; - } else { + } else if (filterResult) { bundle.add(record); + continue recordsLoop; } } + + ArrayList newBundle = new ArrayList<>(); + newBundle.add(record); + bundles.add(newBundle); } return bundles;