From 2f2fcd94f15c1e9d9762491f8d0e5c865f678677 Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Mon, 26 May 2025 21:01:22 -0400 Subject: [PATCH] force spit sideness --- .../psforever/actors/session/normal/GeneralLogic.scala | 8 +++++++- .../objects/avatar/interaction/WithEntrance.scala | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala index 3a84a4324..32e9bc6c2 100644 --- a/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala +++ b/src/main/scala/net/psforever/actors/session/normal/GeneralLogic.scala @@ -18,6 +18,7 @@ import net.psforever.objects.serverobject.affinity.FactionAffinity import net.psforever.objects.serverobject.containable.Containable import net.psforever.objects.serverobject.doors.Door import net.psforever.objects.serverobject.generator.Generator +import net.psforever.objects.serverobject.interior.Sidedness.OutsideOf import net.psforever.objects.serverobject.llu.CaptureFlag import net.psforever.objects.serverobject.locks.IFFLock import net.psforever.objects.serverobject.mblocker.Locker @@ -406,7 +407,12 @@ class GeneralLogic(val ops: GeneralOperations, implicit val context: ActorContex } log.info(s"${player.Name} is constructing a $ammoType deployable") sessionLogic.zoning.CancelZoningProcessWithDescriptiveReason("cancel_use") - ops.handleDeployObject(continent, ammoType, pos, orient, player.WhichSide, player.Faction, player, obj) + if (obj.AmmoType == DeployedItem.spitfire_turret || obj.AmmoType == DeployedItem.spitfire_cloaked) { + ops.handleDeployObject(continent, ammoType, pos, orient, OutsideOf, player.Faction, player, obj) + } + else { + ops.handleDeployObject(continent, ammoType, pos, orient, player.WhichSide, player.Faction, player, obj) + } case Some(obj) => log.warn(s"DeployObject: what is $obj, ${player.Name}? It's not a construction tool!") case None => diff --git a/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala b/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala index 9064efb16..8263b7627 100644 --- a/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala +++ b/src/main/scala/net/psforever/objects/avatar/interaction/WithEntrance.scala @@ -65,7 +65,7 @@ class WithEntrance() obj: InteractsWithZone, door: Door ): Sidedness = { - debugInteriorCheck(obj, door) + //debugInteriorCheck(obj, door) strictInteriorCheck(obj, door) }