From 44a4d9b5f9ebbd0d39625280c923d0d77cb7e066 Mon Sep 17 00:00:00 2001
From: tfarley <tfarley@users.noreply.github.com>
Date: Sat, 23 Jul 2016 22:49:51 -0700
Subject: [PATCH] Packet: ObjectHeldMessage

* Add ObjectHeldMessage packet

* Add ObjectHeldMessage test

* Add ObjectHeldMessage handler stub
---
 .../psforever/packet/GamePacketOpcode.scala   |  2 +-
 .../packet/game/ObjectHeldMessage.scala       | 23 +++++++++++++++++++
 common/src/test/scala/GamePacketTest.scala    | 22 ++++++++++++++++++
 .../src/main/scala/WorldSessionActor.scala    |  3 +++
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 common/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala

diff --git a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala
index f7de14b05..0c0437e7e 100644
--- a/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala
+++ b/common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala
@@ -380,7 +380,7 @@ object GamePacketOpcode extends Enumeration {
 
       // OPCODE 50
       case SetCurrentAvatarMessage => game.SetCurrentAvatarMessage.decode
-      case ObjectHeldMessage => noDecoder(opcode)
+      case ObjectHeldMessage => game.ObjectHeldMessage.decode
       case WeaponFireMessage => noDecoder(opcode)
       case AvatarJumpMessage => noDecoder(opcode)
       case PickupItemMessage => noDecoder(opcode)
diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala b/common/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala
new file mode 100644
index 000000000..f31641b6c
--- /dev/null
+++ b/common/src/main/scala/net/psforever/packet/game/ObjectHeldMessage.scala
@@ -0,0 +1,23 @@
+// Copyright (c) 2016 PSForever.net to present
+package net.psforever.packet.game
+
+import net.psforever.packet.{GamePacketOpcode, Marshallable, PacketHelpers, PlanetSideGamePacket}
+import scodec.Codec
+import scodec.codecs._
+
+final case class ObjectHeldMessage(avatar_guid : PlanetSideGUID,
+                                   held_holsters : Int,
+                                   unk1 : Boolean)
+  extends PlanetSideGamePacket {
+  type Packet = ObjectHeldMessage
+  def opcode = GamePacketOpcode.ObjectHeldMessage
+  def encode = ObjectHeldMessage.encode(this)
+}
+
+object ObjectHeldMessage extends Marshallable[ObjectHeldMessage] {
+  implicit val codec : Codec[ObjectHeldMessage] = (
+      ("avatar_guid" | PlanetSideGUID.codec) ::
+        ("held_holsters" | uint8L) ::
+        ("unk1" | bool)
+    ).as[ObjectHeldMessage]
+}
diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala
index 07bf92d11..552008899 100644
--- a/common/src/test/scala/GamePacketTest.scala
+++ b/common/src/test/scala/GamePacketTest.scala
@@ -327,5 +327,27 @@ class GamePacketTest extends Specification {
         pkt mustEqual string
       }
     }
+
+    "ObjectHeldMessage" should {
+      val string = hex"33 4B00 02 00"
+
+      "decode" in {
+        PacketCoding.DecodePacket(string).require match {
+          case ObjectHeldMessage(avatar_guid, held_holsters, unk1) =>
+            avatar_guid mustEqual PlanetSideGUID(75)
+            held_holsters mustEqual (1 << 1)
+            unk1 mustEqual false
+          case default =>
+            ko
+        }
+      }
+
+      "encode" in {
+        val msg = ObjectHeldMessage(PlanetSideGUID(75), (1 << 1), false)
+        val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
+
+        pkt mustEqual string
+      }
+    }
   }
 }
diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala
index 2920e1366..d2a6d3dd4 100644
--- a/pslogin/src/main/scala/WorldSessionActor.scala
+++ b/pslogin/src/main/scala/WorldSessionActor.scala
@@ -174,6 +174,9 @@ class WorldSessionActor extends Actor with MDCContextAware {
       log.info("Reload: " + msg)
       sendResponse(PacketCoding.CreateGamePacket(0, ReloadMessage(item_guid, 123, unk1)))
 
+    case msg @ ObjectHeldMessage(avatar_guid, held_holsters, unk1) =>
+      log.info("ObjectHeld: " + msg)
+
     case default => log.debug(s"Unhandled GamePacket ${pkt}")
   }