From 4fe871455d62901edc44ee8dac00de324ada8215 Mon Sep 17 00:00:00 2001
From: Fate-JH <Jason_DiDonato@yahoo.com>
Date: Sun, 6 Oct 2019 14:02:11 -0400
Subject: [PATCH] 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)

---
 .../objects/definition/converter/AvatarConverter.scala     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala b/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
index 65c47dc2..163d698c 100644
--- a/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
+++ b/common/src/main/scala/net/psforever/objects/definition/converter/AvatarConverter.scala
@@ -51,7 +51,7 @@ class AvatarConverter extends ObjectCreateConverter[Player]() {
           MakeAppearanceData(obj),
           MakeDetailedCharacterData(obj),
           MakeDetailedInventoryData(obj),
-          DrawnSlot.None
+          GetDrawnSlot(obj)
         )
       }
     )
@@ -365,6 +365,9 @@ object AvatarConverter {
     * @return the holster's Enumeration 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)
+    }
   }
 }