From 09172edcd96af856f57b5a33784a5c4516453e42 Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Fri, 17 Feb 2023 21:34:08 -0500 Subject: [PATCH] subtracting ammo when should not (#1028) --- .../session/support/WeaponAndProjectileOperations.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala b/src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala index c6ab4b24..b6535686 100644 --- a/src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala +++ b/src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala @@ -158,8 +158,9 @@ private[support] class WeaponAndProjectileOperations( def handleChangeFireStateStop(pkt: ChangeFireStateMessage_Stop): Unit = { val ChangeFireStateMessage_Stop(item_guid) = pkt + val now = System.currentTimeMillis() prefire -= item_guid - shootingStop += item_guid -> System.currentTimeMillis() + shootingStop += item_guid -> now shooting -= item_guid val pguid = player.GUID sessionData.findEquipment(item_guid) match { @@ -174,8 +175,7 @@ private[support] class WeaponAndProjectileOperations( continent.id, AvatarAction.ChangeFireState_Start(pguid, item_guid) ) - ongoingShotsFired = ongoingShotsFired + tool.Discharge() - shootingStart += item_guid -> (System.currentTimeMillis() - 1L) + shootingStart += item_guid -> (now - 1L) } avatarActor ! AvatarActor.UpdateToolDischarge(EquipmentStat(tool.Definition.ObjectId,ongoingShotsFired,0,0)) tool.FireMode match {