in the middle of testing

2026-01-24 20:44:45 +00:00 · 2018-06-03 23:03:30 -04:00 · 2018-06-03 23:03:30 -04:00 · f730be261a
parent 292a9bad23
commit f730be261a
2 changed files with 351 additions and 348 deletions
--- a/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedPlayerData.scala
+++ b/common/src/main/scala/net/psforever/packet/game/objectcreate/DetailedPlayerData.scala
@ -38,7 +38,8 @@ final case class DetailedPlayerData(pos : Option[PlacementData],
                                    drawn_slot : DrawnSlot.Value)
                                   (position_defined : Boolean) extends ConstructorData {
  override def bitsize : Long = {
-    val posSize : Long = if(pos.isDefined) { pos.get.bitsize } else { 0 }
+    //factor guard bool values into the base size, not its corresponding optional field
+    val posSize : Long = if(pos.isDefined) { pos.get.bitsize } else { 0L }
    val appSize : Long = basic_appearance.bitsize
    val charSize = character_data.bitsize
    val inventorySize : Long = if(inventory.isDefined) { inventory.get.bitsize } else { 0L }
--- a/common/src/test/scala/game/objectcreatedetailed/DetailedCharacterDataTest.scala
+++ b/common/src/test/scala/game/objectcreatedetailed/DetailedCharacterDataTest.scala