From 65905b3bdb63e403f3eb2a0d052b5d09234f3ad9 Mon Sep 17 00:00:00 2001
From: Mazo <mazo2@hotmail.com>
Date: Thu, 22 Nov 2018 01:01:21 +0000
Subject: [PATCH] Add locker/turret constructor that allows setting position
 (#236)

* Add locker constructor that allows setting position

* Also add a constructor to set position on base turrets
---
 .../psforever/objects/serverobject/mblocker/Locker.scala | 8 ++++++++
 .../objects/serverobject/turret/FacilityTurret.scala     | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/common/src/main/scala/net/psforever/objects/serverobject/mblocker/Locker.scala b/common/src/main/scala/net/psforever/objects/serverobject/mblocker/Locker.scala
index a7b9f52e..ccfef781 100644
--- a/common/src/main/scala/net/psforever/objects/serverobject/mblocker/Locker.scala
+++ b/common/src/main/scala/net/psforever/objects/serverobject/mblocker/Locker.scala
@@ -35,4 +35,12 @@ object Locker {
     obj.Actor = context.actorOf(Props(classOf[LockerControl], obj), s"${obj.Definition.Name}_$id")
     obj
   }
+
+  import net.psforever.types.Vector3
+  def Constructor(pos: Vector3)(id : Int, context : ActorContext) : Locker = {
+    val obj = Locker()
+    obj.Position = pos
+    obj.Actor = context.actorOf(Props(classOf[LockerControl], obj), s"${obj.Definition.Name}_$id")
+    obj
+  }
 }
diff --git a/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurret.scala b/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurret.scala
index 7cf7dc3b..78a592c3 100644
--- a/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurret.scala
+++ b/common/src/main/scala/net/psforever/objects/serverobject/turret/FacilityTurret.scala
@@ -2,6 +2,7 @@
 package net.psforever.objects.serverobject.turret
 
 import net.psforever.objects.serverobject.structures.Amenity
+import net.psforever.types.Vector3
 
 class FacilityTurret(tDef : TurretDefinition) extends Amenity
   with WeaponTurret {
@@ -53,4 +54,12 @@ object FacilityTurret {
     obj.Actor = context.actorOf(Props(classOf[FacilityTurretControl], obj), s"${tdef.Name}_$id")
     obj
   }
+
+  def Constructor(tdef : TurretDefinition, pos: Vector3)(id : Int, context : ActorContext) : FacilityTurret = {
+    import akka.actor.Props
+    val obj = FacilityTurret(tdef)
+    obj.Position = pos
+    obj.Actor = context.actorOf(Props(classOf[FacilityTurretControl], obj), s"${tdef.Name}_$id")
+    obj
+  }
 }