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

Add new ObjectCreateMessage definiton

Browse source 
Also unbreak the build
This commit is contained in:
Chord 2016-07-30 12:59:07 -04:00
parent b9ef1fd725
commit 4c3f81f86a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/src/main/scala/net/psforever/packet/game/ObjectCreateMessage.scala
View file

@ -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]
}