From 4422c249dc32aff7297e5787c3ae99975d9281f4 Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Thu, 18 Apr 2024 17:07:16 +0200 Subject: [PATCH] Made loose filter more loose Signed-off-by: D4rkr34lm --- .../de/steamwar/bausystem/features/tracer/TraceCommand.java | 3 +-- .../bausystem/features/tracer/rendering/BundleFilter.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java index 5ef8c6d0..35c1eed4 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceCommand.java @@ -79,8 +79,7 @@ public class TraceCommand extends SWCommand { } @Register(value = {"show", "from"}, description = "TRACE_COMMAND_HELP_SHOW_FROM_WITH") - public void showFromTo(@Validator Player player, @Min(intValue = 0) int from, @StaticValue("with") String with, - @OptionalValue("STRICT") BundleFilter bundleFilter, @ArrayLength(min = 1) ViewFlag... flags) { + public void showFromTo(@Validator Player player, @Min(intValue = 0) int from, @StaticValue("with") String with, @OptionalValue("STRICT") BundleFilter bundleFilter, @ArrayLength(min = 1) ViewFlag... flags) { showInternal(player, from, Integer.MAX_VALUE, bundleFilter, flags); BauSystem.MESSAGE.send("TRACE_MESSAGE_SHOW_FROM", player, from); } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/BundleFilter.java b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/BundleFilter.java index 85c2b3ef..475b22ff 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/BundleFilter.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/rendering/BundleFilter.java @@ -29,8 +29,8 @@ public enum BundleFilter { LOOSE((TNTPoint a, TNTPoint b) -> { if (a.isExplosion() != b.isExplosion()) return false; - if (a.getLocation().distanceSquared(b.getLocation()) <= BundleFilter.pixelSizeSquared) return false; - if (a.getVelocity().distanceSquared(b.getVelocity()) <= BundleFilter.pixelSizeSquared) return false; + if (a.getLocation().distanceSquared(b.getLocation()) <= BundleFilter.pixelSizeSquared * 8) return false; + if (a.getVelocity().distanceSquared(b.getVelocity()) <= BundleFilter.pixelSizeSquared * 8) return false; return true; }),