From 90b7d2591d11ca595f4918a1e2b7a885271bd286 Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Wed, 26 Apr 2023 12:24:35 -0400 Subject: [PATCH] checking for contribution during a base capture does not result in the generation of heat (#1070) --- .../net/psforever/objects/zones/ZoneHotSpotProjector.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala b/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala index 013ccb26..a730afe6 100644 --- a/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala +++ b/src/main/scala/net/psforever/objects/zones/ZoneHotSpotProjector.scala @@ -349,8 +349,11 @@ class ZoneHotSpotHistory(zone: Zone, hotspots: ListBuffer[HotSpotInfo], blanking val out = progressionOfIntervals .flatMap { y => val yFloat = span * y.toFloat - progressionOfIntervals.map { x => TryHotSpot(lowerLeftCorner + Vector3(span * x.toFloat, yFloat, 0f)) } + progressionOfIntervals.map { x => + hotspots.find { _.DisplayLocation == lowerLeftCorner + Vector3(span * x.toFloat, yFloat, 0f) } + } } + .flatten .filter { info => Vector3.DistanceSquared(center, info.DisplayLocation) < squareRadius } .distinctBy { _.DisplayLocation } .toList