PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-19 18:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check that weapon magzine is empty before sending WeaponDryFireMessage (#507)

Browse source
This commit is contained in:
Mazo 2020-06-29 18:06:28 +01:00 committed by GitHub
parent 5437b3f068
commit 8174a3351c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -1973,7 +1973,16 @@ class WorldSessionActor extends Actor
case AvatarResponse.WeaponDryFire(weapon_guid) =>
if(tplayer_guid != guid) {
sendResponse(WeaponDryFireMessage(weapon_guid))
// Check that the magazine is still empty before sending WeaponDryFireMessage
// As it could have been reloaded since the packet was dispatched, which would make other clients not see it firing
continent.GUID(weapon_guid) match {
case Some(tool : Tool) => {
if(tool.Magazine == 0) {
sendResponse(WeaponDryFireMessage(weapon_guid))
}
}
case _ => log.warn(s"Tried to send WeaponDryFire but GUID ${weapon_guid} does not seem to be a Tool")
}
}
case AvatarResponse.TerminalOrderResult(terminal_guid, action, result) =>