PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-12 15:04:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix hack timer on map base details not showing

Browse source
This commit is contained in:
Mazo 2021-04-01 22:27:28 +01:00
parent 7e1466c898
commit 920d71c2f3
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/scala/net/psforever/packet/game/CaptureFlagUpdateMessage.scala
View file

@ -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 target_map_id The mapID of the base the LLU must be delivered to
* @param x X map position * @param x X map position
* @param y Y map position * @param y Y map position
* @param u6 Time remaining for hack? No effect when modified * @param hack_time_remaining Time remaining on hack - will override BuildingInfoUpdateMessage when displaying hack timer on map base details
* @param isMonolithUnit Changes the icon on the map to the monolith unit icon * @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] { object FlagInfo extends Marshallable[FlagInfo] {
implicit val codec: Codec[FlagInfo] = { implicit val codec: Codec[FlagInfo] = {
(("u1" | uint2L) (("u1" | uint2L)
@ -35,8 +35,8 @@ object FlagInfo extends Marshallable[FlagInfo] {
:: ("target_map_id" | uint16L) :: ("target_map_id" | uint16L)
:: ("u4" | newcodecs.q_float(0.0, 8192.0, 20)) :: ("u4" | newcodecs.q_float(0.0, 8192.0, 20))
:: ("u5" | newcodecs.q_float(0.0, 8192.0, 20)) :: ("u5" | newcodecs.q_float(0.0, 8192.0, 20))
:: ("u6" | uint32L) :: ("hack_time_remaining" | uint32L)
:: ("isMonolithUnit" | bool)) :: ("is_monolith_unit" | bool))
}.as[FlagInfo] }.as[FlagInfo]
} }

4
src/main/scala/net/psforever/services/local/support/CaptureFlagManager.scala
View file

@ -71,8 +71,8 @@ class CaptureFlagManager(val taskResolver: ActorRef, zone: Zone) extends Actor{
target_map_id = flag.Target.MapId, target_map_id = flag.Target.MapId,
x = flag.Position.x, x = flag.Position.x,
y = flag.Position.y, y = flag.Position.y,
u6 = 0, hack_time_remaining = flag.Owner.asInstanceOf[Building].infoUpdateMessage().hack_time_remaining,
isMonolithUnit = false is_monolith_unit = false
) )
) )