From 4c3f81f86ac5146bf1e7be5b725cedc57a33d00b Mon Sep 17 00:00:00 2001 From: Chord Date: Sat, 30 Jul 2016 12:59:07 -0400 Subject: [PATCH] Add new ObjectCreateMessage definiton Also unbreak the build --- .../net/psforever/packet/game/ObjectCreateMessage.scala | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala b/common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala index 4d3861e30..2fcb5c231 100644 --- a/common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala @@ -8,10 +8,11 @@ import shapeless._ case class ObjectCreateMessageParent(guid : Int, slot : Int) -case class ObjectCreateMessage(streamLength : Long, +case class ObjectCreateMessage(streamLength : Long, // in bits objectClass : Int, guid : Int, - parentInfo : Option[ObjectCreateMessageParent] + parentInfo : Option[ObjectCreateMessageParent], + stream : BitVector ) extends PlanetSideGamePacket { @@ -42,7 +43,7 @@ object ObjectCreateMessage extends Marshallable[ObjectCreateMessage] { }) implicit val codec : Codec[ObjectCreateMessage] = ( - ("stream_length" | uint32L) :: either(bool, parent, noParent).exmap[Pattern]( { + ("stream_length" | uint32L) :: (either(bool, parent, noParent).exmap[Pattern]( { case Left(a :: b :: Some(c) :: HNil) => Attempt.successful(a :: b :: Some(c) :: HNil) case Right(a :: b :: None :: HNil) => Attempt.successful(a :: b :: None :: HNil) // failure cases @@ -51,6 +52,6 @@ object ObjectCreateMessage extends Marshallable[ObjectCreateMessage] { }, { case a :: b :: Some(c) :: HNil => Attempt.successful(Left(a :: b :: Some(c) :: HNil)) case a :: b :: None :: HNil => Attempt.successful(Right(a :: b :: None :: HNil)) - }) + }) :+ ("rest" | bits) ) ).as[ObjectCreateMessage] }