From 7f402ac171ac22c7fc429a5cbec4b12e7495f034 Mon Sep 17 00:00:00 2001
From: Fate-JH <Jason_DiDonato@yahoo.com>
Date: Thu, 16 Apr 2020 17:46:00 -0400
Subject: [PATCH] Resource silo test fix (#354)

* isolated test fix from the inst-act branch

* getting rid of the hack for implant terminal mech coordinates
---
 .../main/scala/net/psforever/objects/zones/Zone.scala  | 10 ----------
 common/src/test/scala/objects/ResourceSiloTest.scala   |  1 +
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/common/src/main/scala/net/psforever/objects/zones/Zone.scala b/common/src/main/scala/net/psforever/objects/zones/Zone.scala
index 3b4db0ad..c7b53f06 100644
--- a/common/src/main/scala/net/psforever/objects/zones/Zone.scala
+++ b/common/src/main/scala/net/psforever/objects/zones/Zone.scala
@@ -402,16 +402,6 @@ class Zone(private val zoneId : String, zoneMap : ZoneMap, zoneNumber : Int) {
     })
     //after all fixed GUID's are defined  ...
     other.foreach(obj => guid.register(obj, "dynamic"))
-    //TODO temporary; convert all old-style ImplantTerminalMech.Constructor with the kind that provides position data
-    import net.psforever.objects.serverobject.implantmech.ImplantTerminalMech
-    import net.psforever.objects.serverobject.terminals.Terminal
-    zoneMap.TerminalToInterface.foreach { case (mech_guid, interface_guid) =>
-      (GUID(mech_guid), GUID(interface_guid)) match {
-        case (Some(mech : ImplantTerminalMech), Some(interface : Terminal)) =>
-          mech.Position = interface.Position
-        case _ => ;
-      }
-    }
   }
 
   private def MakeBuildings(implicit context : ActorContext) : PairMap[Int, Building] = {
diff --git a/common/src/test/scala/objects/ResourceSiloTest.scala b/common/src/test/scala/objects/ResourceSiloTest.scala
index b4d223a4..27d08ca4 100644
--- a/common/src/test/scala/objects/ResourceSiloTest.scala
+++ b/common/src/test/scala/objects/ResourceSiloTest.scala
@@ -100,6 +100,7 @@ class ResourceSiloControlUseTest extends ActorTest {
   guid.register(obj, 2)
   guid.register(player, 3)
   guid.register(vehicle, 4)
+  expectNoMsg(200 milliseconds)
   zone.Transport ! Zone.Vehicle.Spawn(vehicle)
   vehicle.Seats(0).Occupant = player
   player.VehicleSeated = vehicle.GUID