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

subtracting ammo when should not (#1028)

Browse source
This commit is contained in:
Fate-JH 2023-02-17 21:34:08 -05:00 • committed by GitHub
parent 779054fef9
commit 09172edcd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/scala/net/psforever/actors/session/support/WeaponAndProjectileOperations.scala
View file

@ -158,8 +158,9 @@ private[support] class WeaponAndProjectileOperations(
def handleChangeFireStateStop(pkt: ChangeFireStateMessage_Stop): Unit = { def handleChangeFireStateStop(pkt: ChangeFireStateMessage_Stop): Unit = {
val ChangeFireStateMessage_Stop(item_guid) = pkt val ChangeFireStateMessage_Stop(item_guid) = pkt
val now = System.currentTimeMillis()
prefire -= item_guid prefire -= item_guid
shootingStop += item_guid -> System.currentTimeMillis() shootingStop += item_guid -> now
shooting -= item_guid shooting -= item_guid
val pguid = player.GUID val pguid = player.GUID
sessionData.findEquipment(item_guid) match { sessionData.findEquipment(item_guid) match {
@ -174,8 +175,7 @@ private[support] class WeaponAndProjectileOperations(
continent.id, continent.id,
AvatarAction.ChangeFireState_Start(pguid, item_guid) AvatarAction.ChangeFireState_Start(pguid, item_guid)
) )
ongoingShotsFired = ongoingShotsFired + tool.Discharge() shootingStart += item_guid -> (now - 1L)
shootingStart += item_guid -> (System.currentTimeMillis() - 1L)
} }
avatarActor ! AvatarActor.UpdateToolDischarge(EquipmentStat(tool.Definition.ObjectId,ongoingShotsFired,0,0)) avatarActor ! AvatarActor.UpdateToolDischarge(EquipmentStat(tool.Definition.ObjectId,ongoingShotsFired,0,0))
tool.FireMode match { tool.FireMode match {