From b5f15cd3d409a26147394a49c9349e7c0bcc0f67 Mon Sep 17 00:00:00 2001
From: Resaec <resaecscript@googlemail.com>
Date: Fri, 1 Dec 2023 00:51:38 +0100
Subject: [PATCH] GM command capturebase kicks players from turrets

---
 .../scala/net/psforever/actors/session/ChatActor.scala |  5 +++++
 .../actors/session/support/SessionMountHandlers.scala  | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/net/psforever/actors/session/ChatActor.scala b/src/main/scala/net/psforever/actors/session/ChatActor.scala
index 3c385b71..d695487d 100644
--- a/src/main/scala/net/psforever/actors/session/ChatActor.scala
+++ b/src/main/scala/net/psforever/actors/session/ChatActor.scala
@@ -483,8 +483,13 @@ class ChatActor(
                   )
                   buildings foreach { building =>
                     // TODO implement timer
+
+                    val terminal = building.CaptureTerminal.get
+
                     building.Actor ! BuildingActor.SetFaction(faction)
+                    building.Actor ! BuildingActor.AmenityStateChange(terminal, Some(false))
                   }
+
                 case (_, Some(0), _, None, _) =>
                   sessionActor ! SessionActor.SendResponse(
                     ChatMsg(
diff --git a/src/main/scala/net/psforever/actors/session/support/SessionMountHandlers.scala b/src/main/scala/net/psforever/actors/session/support/SessionMountHandlers.scala
index 8174f42a..73d98304 100644
--- a/src/main/scala/net/psforever/actors/session/support/SessionMountHandlers.scala
+++ b/src/main/scala/net/psforever/actors/session/support/SessionMountHandlers.scala
@@ -258,17 +258,17 @@ class SessionMountHandlers(
       case Mountable.CanDismount(obj: Mountable, _, _) =>
         log.warn(s"DismountVehicleMsg: $obj is some dismountable object but nothing will happen for ${player.Name}")
 
-      case Mountable.CanNotMount(obj: Vehicle, mountPoint) =>
-        log.warn(s"MountVehicleMsg: ${tplayer.Name} attempted to mount $obj's mount $mountPoint, but was not allowed")
-        obj.GetSeatFromMountPoint(mountPoint).collect {
+      case Mountable.CanNotMount(obj: Vehicle, seatNumber) =>
+        log.warn(s"MountVehicleMsg: ${tplayer.Name} attempted to mount $obj's seat $seatNumber, but was not allowed")
+        obj.GetSeatFromMountPoint(seatNumber).collect {
           case seatNum if obj.SeatPermissionGroup(seatNum).contains(AccessPermissionGroup.Driver) =>
             sendResponse(
               ChatMsg(ChatMessageType.CMT_OPEN, wideContents=false, recipient="", "You are not the driver of this vehicle.", note=None)
             )
         }
 
-      case Mountable.CanNotMount(obj: Mountable, mountPoint) =>
-        log.warn(s"MountVehicleMsg: ${tplayer.Name} attempted to mount $obj's mount $mountPoint, but was not allowed")
+      case Mountable.CanNotMount(obj: Mountable, seatNumber) =>
+        log.warn(s"MountVehicleMsg: ${tplayer.Name} attempted to mount $obj's seat $seatNumber, but was not allowed")
 
       case Mountable.CanNotDismount(obj, seatNum) =>
         log.warn(s"DismountVehicleMsg: ${tplayer.Name} attempted to dismount $obj's mount $seatNum, but was not allowed")