PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-16 08:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

spectator mode is important to confirm; removed deprecated chat actor; dismount quietly

Browse source
This commit is contained in:
Fate-JH 2024-05-09 09:38:56 -04:00
parent 1115f705af
commit 9abe6a05e9
3 changed files with 7 additions and 1764 deletions
Download patch file Download diff file Expand all files Collapse all files

1759
src/main/scala/net/psforever/actors/session/ChatActor.scala
View file

File diff suppressed because it is too large Load diff

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

@ -45,7 +45,7 @@ class ChatLogic(val ops: ChatOperations, implicit val context: ActorContext) ext
case (CMT_SPEED, _, contents) if gmCommandAllowed => case (CMT_SPEED, _, contents) if gmCommandAllowed =>
ops.commandSpeed(message, contents) ops.commandSpeed(message, contents)
case (CMT_TOGGLESPECTATORMODE, _, contents) if isAlive /*&& (gmCommandAllowed || perms.canSpectate)*/ => case (CMT_TOGGLESPECTATORMODE, _, contents) if isAlive && (gmCommandAllowed || perms.canSpectate) =>
ops.commandToggleSpectatorMode(session, contents) ops.commandToggleSpectatorMode(session, contents)
case (CMT_RECALL, _, _) => case (CMT_RECALL, _, _) =>

10
src/main/scala/net/psforever/actors/session/spectator/SpectatorMode.scala
View file

@ -58,8 +58,6 @@ class SpectatorModeLogic(data: SessionData) extends ModeLogic {
val pguid = player.GUID val pguid = player.GUID
val sendResponse: PlanetSidePacket=>Unit = data.sendResponse val sendResponse: PlanetSidePacket=>Unit = data.sendResponse
// //
sendResponse(ChatMsg(ChatMessageType.CMT_TOGGLESPECTATORMODE, "on"))
sendResponse(ChatMsg(ChatMessageType.UNK_227, "@SpectatorEnabled"))
continent.actor ! ZoneActor.RemoveFromBlockMap(player) continent.actor ! ZoneActor.RemoveFromBlockMap(player)
continent continent
.GUID(data.terminals.usingMedicalTerminal) .GUID(data.terminals.usingMedicalTerminal)
@ -95,10 +93,12 @@ class SpectatorModeLogic(data: SessionData) extends ModeLogic {
case (Some(obj: Vehicle), Some(seatNum)) if seatNum == 0 => case (Some(obj: Vehicle), Some(seatNum)) if seatNum == 0 =>
data.vehicles.ServerVehicleOverrideStop(obj) data.vehicles.ServerVehicleOverrideStop(obj)
obj.Actor ! ServerObject.AttributeMsg(10, 3) //faction-accessible driver seat obj.Actor ! ServerObject.AttributeMsg(10, 3) //faction-accessible driver seat
obj.Actor ! Mountable.TryDismount(player, seatNum) obj.Seat(seatNum).foreach(_.unmount(player))
player.VehicleSeated = None
Some(ObjectCreateMessageParent(obj.GUID, seatNum)) Some(ObjectCreateMessageParent(obj.GUID, seatNum))
case (Some(obj), Some(seatNum)) => case (Some(obj), Some(seatNum)) =>
obj.Actor ! Mountable.TryDismount(player, seatNum) obj.Seat(seatNum).foreach(_.unmount(player))
player.VehicleSeated = None
Some(ObjectCreateMessageParent(obj.GUID, seatNum)) Some(ObjectCreateMessageParent(obj.GUID, seatNum))
case _ => case _ =>
None None
@ -148,6 +148,8 @@ class SpectatorModeLogic(data: SessionData) extends ModeLogic {
handheld.Definition.Packet.DetailedConstructorData(handheld).get handheld.Definition.Packet.DetailedConstructorData(handheld).get
)) ))
data.zoning.spawn.HandleSetCurrentAvatar(newPlayer) data.zoning.spawn.HandleSetCurrentAvatar(newPlayer)
sendResponse(ChatMsg(ChatMessageType.CMT_TOGGLESPECTATORMODE, "on"))
sendResponse(ChatMsg(ChatMessageType.UNK_227, "@SpectatorEnabled"))
data.session = session.copy(player = player) data.session = session.copy(player = player)
} }