wrote WithEntrance interaction to be able to switch between normal / …

…debug modes; telepad and router sidedness support; fixed bang-commands; fixed issue with proessing player mounted state; added zone entity discovery feature (unused)
psforever · Mar 26, 2024 · ad2e535 · ad2e535
1 parent 86acd94
commit ad2e535
Show file tree

Hide file tree

Showing 5 changed files with 792 additions and 610 deletions.
diff --git a/src/main/scala/net/psforever/actors/session/AvatarActor.scala b/src/main/scala/net/psforever/actors/session/AvatarActor.scala
@@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger
 import net.psforever.actors.zone.ZoneActor
 import net.psforever.objects.avatar.scoring.{Assist, Death, EquipmentStat, KDAStat, Kill, Life, ScoreCard, SupportActivity}
 import net.psforever.objects.serverobject.affinity.FactionAffinity
-import net.psforever.objects.sourcing.VehicleSource
+import net.psforever.objects.sourcing.{TurretSource, VehicleSource}
 import net.psforever.objects.vital.{InGameHistory, ReconstructionActivity}
 import net.psforever.objects.vehicles.MountedWeapons
 import net.psforever.types.{ChatMessageType, StatisticalCategory, StatisticalElement}
@@ -3188,10 +3188,16 @@ class AvatarActor(
       player.HistoryAndContributions()
     }
     val target = killStat.info.targetAfter.asInstanceOf[PlayerSource]
-    val targetMounted = target.seatedIn.map { case (v: VehicleSource, seat) =>
-      val definition = v.Definition
-      definition.ObjectId * 10 + Vehicles.SeatPermissionGroup(definition, seat).map { _.id }.getOrElse(0)
-    }.getOrElse(0)
+    val targetMounted = target.seatedIn
+      .collect {
+        case (v: VehicleSource, seat) =>
+          val definition = v.Definition
+          definition.ObjectId * 10 + Vehicles.SeatPermissionGroup(definition, seat).map { _.id }.getOrElse(0)
+        case (t: TurretSource, seat) =>
+          val definition = t.Definition
+          definition.ObjectId * 10 + seat
+      }
+      .getOrElse(0)
     zones.exp.ToDatabase.reportKillBy(
       avatar.id.toLong,
       target.CharId,