From 8701cfa3a559effe8bd4521339095015fc31a903 Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Mon, 4 Nov 2024 17:05:56 -0500 Subject: [PATCH] pruning imports and correcting the default spectator setting --- .../actors/session/csr/ChatLogic.scala | 2 +- .../actors/session/normal/ChatLogic.scala | 4 ++-- .../session/spectator/VehicleHandlerLogic.scala | 17 +++++++---------- .../actors/session/support/ChatOperations.scala | 3 ++- .../session/support/ZoningOperations.scala | 2 +- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/scala/net/psforever/actors/session/csr/ChatLogic.scala b/src/main/scala/net/psforever/actors/session/csr/ChatLogic.scala index b41de7dd5..3ec8216ab 100644 --- a/src/main/scala/net/psforever/actors/session/csr/ChatLogic.scala +++ b/src/main/scala/net/psforever/actors/session/csr/ChatLogic.scala @@ -22,7 +22,7 @@ object ChatLogic { class ChatLogic(val ops: ChatOperations, implicit val context: ActorContext) extends ChatFunctions { def sessionLogic: SessionData = ops.sessionLogic - ops.SpectatorMode = SpectateAsCustomerServiceRepresentativeMode + ops.CurrentSpectatorMode = SpectateAsCustomerServiceRepresentativeMode private var comms: ChatChannel = DefaultChannel private var seeSpectatorsIn: Option[Zone] = None diff --git a/src/main/scala/net/psforever/actors/session/normal/ChatLogic.scala b/src/main/scala/net/psforever/actors/session/normal/ChatLogic.scala index aa3c93ace..3035916f8 100644 --- a/src/main/scala/net/psforever/actors/session/normal/ChatLogic.scala +++ b/src/main/scala/net/psforever/actors/session/normal/ChatLogic.scala @@ -20,7 +20,7 @@ object ChatLogic { class ChatLogic(val ops: ChatOperations, implicit val context: ActorContext) extends ChatFunctions { def sessionLogic: SessionData = ops.sessionLogic - ops.SpectatorMode = SpectatorMode + ops.CurrentSpectatorMode = SpectatorMode def handleChatMsg(message: ChatMsg): Unit = { import net.psforever.types.ChatMessageType._ @@ -167,7 +167,7 @@ class ChatLogic(val ops: ChatOperations, implicit val context: ActorContext) ext } || Config.app.world.serverType == ServerType.Development contents.toLowerCase() match { case "on" | "o" | "" if currentSpectatorActivation && !player.spectator => - context.self ! SessionActor.SetMode(ops.SpectatorMode) + context.self ! SessionActor.SetMode(ops.CurrentSpectatorMode) case _ => () } } diff --git a/src/main/scala/net/psforever/actors/session/spectator/VehicleHandlerLogic.scala b/src/main/scala/net/psforever/actors/session/spectator/VehicleHandlerLogic.scala index 536529dbd..ac930161c 100644 --- a/src/main/scala/net/psforever/actors/session/spectator/VehicleHandlerLogic.scala +++ b/src/main/scala/net/psforever/actors/session/spectator/VehicleHandlerLogic.scala @@ -1,18 +1,15 @@ // Copyright (c) 2024 PSForever package net.psforever.actors.session.spectator -import akka.actor.{ActorContext, ActorRef, typed} -import net.psforever.actors.session.AvatarActor +import akka.actor.ActorContext import net.psforever.actors.session.support.{SessionData, SessionVehicleHandlers, VehicleHandlerFunctions} -import net.psforever.objects.{GlobalDefinitions, Tool, Vehicle, Vehicles} -import net.psforever.objects.equipment.{Equipment, JammableMountedWeapons, JammableUnit} -import net.psforever.objects.guid.{GUIDTask, TaskWorkflow} +import net.psforever.objects.{Tool, Vehicle, Vehicles} +import net.psforever.objects.equipment.Equipment import net.psforever.objects.serverobject.pad.VehicleSpawnPad import net.psforever.packet.game.objectcreate.ObjectCreateMessageParent -import net.psforever.packet.game.{ChangeAmmoMessage, ChangeFireStateMessage_Start, ChangeFireStateMessage_Stop, ChatMsg, ChildObjectStateMessage, DeadState, DeployRequestMessage, DismountVehicleMsg, FrameVehicleStateMessage, GenericObjectActionMessage, HitHint, InventoryStateMessage, ObjectAttachMessage, ObjectCreateDetailedMessage, ObjectCreateMessage, ObjectDeleteMessage, ObjectDetachMessage, PlanetsideAttributeMessage, ReloadMessage, ServerVehicleOverrideMsg, VehicleStateMessage, WeaponDryFireMessage} -import net.psforever.services.Service +import net.psforever.packet.game.{ChangeAmmoMessage, ChangeFireStateMessage_Start, ChangeFireStateMessage_Stop, ChildObjectStateMessage, DeadState, DeployRequestMessage, DismountVehicleMsg, FrameVehicleStateMessage, GenericObjectActionMessage, HitHint, InventoryStateMessage, ObjectAttachMessage, ObjectCreateDetailedMessage, ObjectCreateMessage, ObjectDeleteMessage, ObjectDetachMessage, PlanetsideAttributeMessage, ReloadMessage, ServerVehicleOverrideMsg, VehicleStateMessage, WeaponDryFireMessage} import net.psforever.services.vehicle.{VehicleResponse, VehicleServiceResponse} -import net.psforever.types.{BailType, ChatMessageType, PlanetSideGUID, Vector3} +import net.psforever.types.{BailType, PlanetSideGUID, Vector3} object VehicleHandlerLogic { def apply(ops: SessionVehicleHandlers): VehicleHandlerLogic = { @@ -23,9 +20,9 @@ object VehicleHandlerLogic { class VehicleHandlerLogic(val ops: SessionVehicleHandlers, implicit val context: ActorContext) extends VehicleHandlerFunctions { def sessionLogic: SessionData = ops.sessionLogic - private val avatarActor: typed.ActorRef[AvatarActor.Command] = ops.avatarActor + //private val avatarActor: typed.ActorRef[AvatarActor.Command] = ops.avatarActor - private val galaxyService: ActorRef = ops.galaxyService + //private val galaxyService: ActorRef = ops.galaxyService /** * na diff --git a/src/main/scala/net/psforever/actors/session/support/ChatOperations.scala b/src/main/scala/net/psforever/actors/session/support/ChatOperations.scala index 381b80f84..2eaad6e9a 100644 --- a/src/main/scala/net/psforever/actors/session/support/ChatOperations.scala +++ b/src/main/scala/net/psforever/actors/session/support/ChatOperations.scala @@ -4,6 +4,7 @@ package net.psforever.actors.session.support import akka.actor.Cancellable import akka.actor.typed.ActorRef import akka.actor.{ActorContext, typed} +import net.psforever.actors.session.spectator.SpectatorMode import net.psforever.actors.session.{AvatarActor, SessionActor} import net.psforever.actors.zone.ZoneActor import net.psforever.objects.sourcing.PlayerSource @@ -65,7 +66,7 @@ class ChatOperations( */ private val ignoredEmoteCooldown: mutable.LongMap[Long] = mutable.LongMap[Long]() - private[session] var SpectatorMode: PlayerMode = SpectatorMode + private[session] var CurrentSpectatorMode: PlayerMode = SpectatorMode import akka.actor.typed.scaladsl.adapter._ private val chatServiceAdapter: ActorRef[ChatService.MessageResponse] = context.self.toTyped[ChatService.MessageResponse] diff --git a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala index 527ffc520..cf6c0f1ea 100644 --- a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala +++ b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala @@ -3229,7 +3229,7 @@ class ZoningOperations( upstreamMessageCount = 0 if (tplayer.spectator) { if (!setAvatar) { - context.self ! SessionActor.SetMode(sessionLogic.chat.SpectatorMode) //should reload spectator status + context.self ! SessionActor.SetMode(sessionLogic.chat.CurrentSpectatorMode) //should reload spectator status } } else if ( !avatar.permissions.canGM && /* gm's are excluded */