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

no longer foul up the first attempt to exchange weapons after a quick grenade (#1011)

Browse source
This commit is contained in:
Fate-JH 2022-10-25 01:47:27 -04:00 committed by GitHub
parent 630c2809cb
commit d68ccdfd8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/scala/net/psforever/actors/session/SessionActor.scala
View file

@ -2315,7 +2315,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
sendResponse(ObjectDeleteMessage(item_guid, unk))
}
case AvatarResponse.ObjectHeld(slot, previousSLot) =>
case AvatarResponse.ObjectHeld(slot, previousSlot) =>
if (tplayer_guid == guid) {
if (slot > -1) {
sendResponse(ObjectHeldMessage(guid, slot, unk1=true))
@ -2329,7 +2329,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
}
}
} else {
sendResponse(ObjectHeldMessage(guid, previousSLot, unk1=false))
sendResponse(ObjectHeldMessage(guid, previousSlot, unk1=false))
}
case AvatarResponse.OxygenState(player, vehicle) =>

8
src/main/scala/net/psforever/login/WorldSession.scala
View file

@ -806,12 +806,14 @@ object WorldSession {
}
optGrenadeInSlot match {
case Some((grenade, slotNum)) =>
tplayer.ResistArmMotion(countRestrictAttempts(count=1))
val itemInPreviouslyDrawnSlotToDrop = if (equipSlot != previouslyDrawnSlot) {
forcedTolowerRaisedArm(tplayer, tplayer.GUID, tplayer.Zone)
tplayer.Slot(previouslyDrawnSlot).Equipment match {
case out @ Some(_) => out
case _ => None
case out @ Some(_) =>
tplayer.ResistArmMotion(countRestrictAttempts(count=1))
out
case _ =>
None
}
} else {
None