From 920d71c2f341356f2efbde3bf841a5185b93f71c Mon Sep 17 00:00:00 2001 From: Mazo Date: Thu, 1 Apr 2021 22:27:28 +0100 Subject: [PATCH] Fix hack timer on map base details not showing --- .../packet/game/CaptureFlagUpdateMessage.scala | 10 +++++----- .../services/local/support/CaptureFlagManager.scala | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/scala/net/psforever/packet/game/CaptureFlagUpdateMessage.scala b/src/main/scala/net/psforever/packet/game/CaptureFlagUpdateMessage.scala index becfbd67..7d99b5da 100644 --- a/src/main/scala/net/psforever/packet/game/CaptureFlagUpdateMessage.scala +++ b/src/main/scala/net/psforever/packet/game/CaptureFlagUpdateMessage.scala @@ -24,10 +24,10 @@ final case class CaptureFlagUpdateMessage(zone_number: Int, flagInfoList: List[F * @param target_map_id The mapID of the base the LLU must be delivered to * @param x X map position * @param y Y map position - * @param u6 Time remaining for hack? No effect when modified - * @param isMonolithUnit Changes the icon on the map to the monolith unit icon + * @param hack_time_remaining Time remaining on hack - will override BuildingInfoUpdateMessage when displaying hack timer on map base details + * @param is_monolith_unit Changes the icon on the map to the monolith unit icon */ -final case class FlagInfo(u1: Int, owner_map_id: Int, target_map_id: Int, x: Float, y: Float, u6: Long, isMonolithUnit: Boolean) +final case class FlagInfo(u1: Int, owner_map_id: Int, target_map_id: Int, x: Float, y: Float, hack_time_remaining: Long, is_monolith_unit: Boolean) object FlagInfo extends Marshallable[FlagInfo] { implicit val codec: Codec[FlagInfo] = { (("u1" | uint2L) @@ -35,8 +35,8 @@ object FlagInfo extends Marshallable[FlagInfo] { :: ("target_map_id" | uint16L) :: ("u4" | newcodecs.q_float(0.0, 8192.0, 20)) :: ("u5" | newcodecs.q_float(0.0, 8192.0, 20)) - :: ("u6" | uint32L) - :: ("isMonolithUnit" | bool)) + :: ("hack_time_remaining" | uint32L) + :: ("is_monolith_unit" | bool)) }.as[FlagInfo] } diff --git a/src/main/scala/net/psforever/services/local/support/CaptureFlagManager.scala b/src/main/scala/net/psforever/services/local/support/CaptureFlagManager.scala index 8dcb52ee..67913bb2 100644 --- a/src/main/scala/net/psforever/services/local/support/CaptureFlagManager.scala +++ b/src/main/scala/net/psforever/services/local/support/CaptureFlagManager.scala @@ -71,8 +71,8 @@ class CaptureFlagManager(val taskResolver: ActorRef, zone: Zone) extends Actor{ target_map_id = flag.Target.MapId, x = flag.Position.x, y = flag.Position.y, - u6 = 0, - isMonolithUnit = false + hack_time_remaining = flag.Owner.asInstanceOf[Building].infoUpdateMessage().hack_time_remaining, + is_monolith_unit = false ) )