PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-19 18:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing a mistaken parameter

Browse source
This commit is contained in:
FateJH 2016-10-17 08:49:20 -04:00
parent 231c8974f5
commit de590cd4e2
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala
View file

@ -27,14 +27,8 @@ import scodec.codecs._
* 21 - `15` - NC Vehicle Training Area<br> * 21 - `15` - NC Vehicle Training Area<br>
* 22 - `16` - VS Vehicle Training Area * 22 - `16` - VS Vehicle Training Area
* @param zone the virtual reality zone to send the player * @param zone the virtual reality zone to send the player
* @param unk1 na; always zero?
* @param unk2 na; always zero?
* @param unk3 na; always zero?
*/ */
final case class TrainingZoneMessage(zone : Int, final case class TrainingZoneMessage(zone : Long)
unk1 : Int,
unk2 : Int,
unk3 : Int)
extends PlanetSideGamePacket { extends PlanetSideGamePacket {
type Packet = TrainingZoneMessage type Packet = TrainingZoneMessage
def opcode = GamePacketOpcode.TrainingZoneMessage def opcode = GamePacketOpcode.TrainingZoneMessage
@ -43,9 +37,6 @@ final case class TrainingZoneMessage(zone : Int,
object TrainingZoneMessage extends Marshallable[TrainingZoneMessage] { object TrainingZoneMessage extends Marshallable[TrainingZoneMessage] {
implicit val codec : Codec[TrainingZoneMessage] = ( implicit val codec : Codec[TrainingZoneMessage] = (
("zone" | uint8L) :: "zone" | uint32L
("unk1" | uint8L) ::
("unk2" | uint8L) ::
("unk3" | uint8L)
).as[TrainingZoneMessage] ).as[TrainingZoneMessage]
} }

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

@ -835,18 +835,15 @@ class GamePacketTest extends Specification {
"decode" in { "decode" in {
PacketCoding.DecodePacket(string).require match { PacketCoding.DecodePacket(string).require match {
case TrainingZoneMessage(zone, unk1, unk2, unk3) => case TrainingZoneMessage(zone) =>
zone mustEqual 19 zone mustEqual 19
unk1 mustEqual 0
unk2 mustEqual 0
unk3 mustEqual 0
case default => case default =>
ko ko
} }
} }
"encode" in { "encode" in {
val msg = TrainingZoneMessage(19, 0, 0, 0) val msg = TrainingZoneMessage(19)
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
pkt mustEqual string pkt mustEqual string