PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-02-12 19:31:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pruning imports and correcting the default spectator setting

Browse source
This commit is contained in:
Fate-JH 2024-11-04 17:05:56 -05:00
parent 5f08db0993
commit 8701cfa3a5
5 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/net/psforever/actors/session/csr/ChatLogic.scala
View file

@ -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

4
src/main/scala/net/psforever/actors/session/normal/ChatLogic.scala
View file

@ -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 _ => ()
}
}

17
src/main/scala/net/psforever/actors/session/spectator/VehicleHandlerLogic.scala
View file

@ -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

3
src/main/scala/net/psforever/actors/session/support/ChatOperations.scala
View file

@ -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]

2
src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
View file

@ -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 */