PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-13 15:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resource silo test fix (#354)

Browse source 
* isolated test fix from the inst-act branch

* getting rid of the hack for implant terminal mech coordinates
This commit is contained in:
Fate-JH 2020-04-16 17:46:00 -04:00 • committed by GitHub
parent 9ac1047a9a
commit 7f402ac171
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/src/main/scala/net/psforever/objects/zones/Zone.scala
View file

@ -402,16 +402,6 @@ class Zone(private val zoneId : String, zoneMap : ZoneMap, zoneNumber : Int) {
}) })
//after all fixed GUID's are defined ... //after all fixed GUID's are defined ...
other.foreach(obj => guid.register(obj, "dynamic")) 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] = { private def MakeBuildings(implicit context : ActorContext) : PairMap[Int, Building] = {

1
common/src/test/scala/objects/ResourceSiloTest.scala
View file

@ -100,6 +100,7 @@ class ResourceSiloControlUseTest extends ActorTest {
guid.register(obj, 2) guid.register(obj, 2)
guid.register(player, 3) guid.register(player, 3)
guid.register(vehicle, 4) guid.register(vehicle, 4)
expectNoMsg(200 milliseconds)
zone.Transport ! Zone.Vehicle.Spawn(vehicle) zone.Transport ! Zone.Vehicle.Spawn(vehicle)
vehicle.Seats(0).Occupant = player vehicle.Seats(0).Occupant = player
player.VehicleSeated = vehicle.GUID player.VehicleSeated = vehicle.GUID