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

issue where MAXes that have traversed a warp gate can not fire their arm weapon; in theory, should also have affected a few more instances (#270)

Browse source
This commit is contained in:
Fate-JH 2019-10-06 14:02:11 -04:00 • committed by GitHub
parent 6cc6a663f5
commit 4fe871455d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
View file

@ -51,7 +51,7 @@ class AvatarConverter extends ObjectCreateConverter[Player]() {
MakeAppearanceData(obj), MakeAppearanceData(obj),
MakeDetailedCharacterData(obj), MakeDetailedCharacterData(obj),
MakeDetailedInventoryData(obj), MakeDetailedInventoryData(obj),
DrawnSlot.None GetDrawnSlot(obj)
) )
} }
) )
@ -365,6 +365,9 @@ object AvatarConverter {
* @return the holster's Enumeration value * @return the holster's Enumeration value
*/ */
def GetDrawnSlot(obj : Player) : DrawnSlot.Value = { def GetDrawnSlot(obj : Player) : DrawnSlot.Value = {
try { DrawnSlot(obj.DrawnSlot) } catch { case _ : Exception => DrawnSlot.None } obj.DrawnSlot match {
case Player.HandsDownSlot | Player.FreeHandSlot => DrawnSlot.None
case n => DrawnSlot(n)
}
} }
} }