From 2fbe9267252954fc6cc8be51b9d4c29c3fe63f2f Mon Sep 17 00:00:00 2001
From: "Jason_DiDonato@yahoo.com" <Jason_DiDonato@yahoo.com>
Date: Mon, 22 Mar 2021 17:45:35 -0400
Subject: [PATCH] tweaks for 'gender -> sex' change

---
 src/main/scala/net/psforever/actors/session/AvatarActor.scala  | 2 +-
 src/main/scala/net/psforever/actors/session/SessionActor.scala | 2 +-
 src/main/scala/net/psforever/persistence/Avatar.scala          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/net/psforever/actors/session/AvatarActor.scala b/src/main/scala/net/psforever/actors/session/AvatarActor.scala
index 460efe18..954e5b6e 100644
--- a/src/main/scala/net/psforever/actors/session/AvatarActor.scala
+++ b/src/main/scala/net/psforever/actors/session/AvatarActor.scala
@@ -306,7 +306,7 @@ class AvatarActor(
                           _.factionId -> lift(empire.id),
                           _.headId    -> lift(head),
                           _.voiceId   -> lift(voice.id),
-                          _.genderId  -> lift(gender.id),
+                          _.genderId  -> lift(gender.value),
                           _.bep       -> lift(Config.app.game.newAvatar.br.experience),
                           _.cep       -> lift(Config.app.game.newAvatar.cr.experience)
                         )
diff --git a/src/main/scala/net/psforever/actors/session/SessionActor.scala b/src/main/scala/net/psforever/actors/session/SessionActor.scala
index a414e69b..f8da832f 100644
--- a/src/main/scala/net/psforever/actors/session/SessionActor.scala
+++ b/src/main/scala/net/psforever/actors/session/SessionActor.scala
@@ -8593,7 +8593,7 @@ class SessionActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], con
     * @return a tuple composed of an `ActorRef` destination and a message to send to that destination
     */
   def LoadZoneInVehicleAsPassenger(vehicle: Vehicle, zoneId: String): Unit = {
-    val msg: String = s"${player.Name} loading into $zoneId as the passenger of a ${vehicle.Definition.Name}\""
+    val msg: String = s"${player.Name} loading into $zoneId as the passenger of a ${vehicle.Definition.Name}"
     log.info(msg)
     log.debug(s"LoadZoneInVehicleAsPassenger: $msg")
     if (!zoneReload && zoneId == continent.id) {
diff --git a/src/main/scala/net/psforever/persistence/Avatar.scala b/src/main/scala/net/psforever/persistence/Avatar.scala
index be0cf099..24dae5f1 100644
--- a/src/main/scala/net/psforever/persistence/Avatar.scala
+++ b/src/main/scala/net/psforever/persistence/Avatar.scala
@@ -27,7 +27,7 @@ case class Avatar(
       id,
       name,
       PlanetSideEmpire(factionId),
-      CharacterSex(genderId),
+      CharacterSex.valuesToEntriesMap(genderId),
       headId,
       CharacterVoice(voiceId),
       bep,