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

Packet: RequestDestroyMessage

Browse source 
* Add RequestDestroyMessage packet

* Add RequestDestroyMessage test

* Add RequestDestroyMessage handler stub
This commit is contained in:
tfarley 2016-07-23 23:00:46 -07:00 committed by pschord
parent 7ecbe203f8
commit 427429b34c
4 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/scala/net/psforever/packet/GamePacketOpcode.scala
View file

@ -372,7 +372,7 @@ object GamePacketOpcode extends Enumeration {
case ObjectAttachMessage => noDecoder(opcode)
case UnknownMessage43 => noDecoder(opcode)
case PlanetsideAttributeMessage => noDecoder(opcode)
case RequestDestroyMessage => noDecoder(opcode)
case RequestDestroyMessage => game.RequestDestroyMessage.decode
case UnknownMessage46 => noDecoder(opcode)
case CharacterCreateRequestMessage => game.CharacterCreateRequestMessage.decode
case CharacterRequestMessage => game.CharacterRequestMessage.decode

19
common/src/main/scala/net/psforever/packet/game/RequestDestroyMessage.scala Normal file
View file

@ -0,0 +1,19 @@
// 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 RequestDestroyMessage(object_guid : PlanetSideGUID)
extends PlanetSideGamePacket {
type Packet = RequestDestroyMessage
def opcode = GamePacketOpcode.RequestDestroyMessage
def encode = RequestDestroyMessage.encode(this)
}
object RequestDestroyMessage extends Marshallable[RequestDestroyMessage] {
implicit val codec : Codec[RequestDestroyMessage] = (
("object_guid" | PlanetSideGUID.codec)
).as[RequestDestroyMessage]
}

20
common/src/test/scala/GamePacketTest.scala
View file

@ -349,5 +349,25 @@ class GamePacketTest extends Specification {
pkt mustEqual string
}
}
"RequestDestroyMessage" should {
val string = hex"2D A49C"
"decode" in {
PacketCoding.DecodePacket(string).require match {
case RequestDestroyMessage(object_guid) =>
object_guid mustEqual PlanetSideGUID(40100)
case default =>
ko
}
}
"encode" in {
val msg = RequestDestroyMessage(PlanetSideGUID(40100))
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
pkt mustEqual string
}
}
}
}

3
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -177,6 +177,9 @@ class WorldSessionActor extends Actor with MDCContextAware {
case msg @ ObjectHeldMessage(avatar_guid, held_holsters, unk1) =>
log.info("ObjectHeld: " + msg)
case msg @ RequestDestroyMessage(object_guid) =>
log.info("RequestDestroy: " + msg)
case default => log.debug(s"Unhandled GamePacket ${pkt}")
}