PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-14 01:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Destruction (#330)

Browse source 
* perform no damage if the target is already destroyed; correct destruction timer override on sensor-type deployables

* framing vehicle remover tasks differently; screening for valid objects at some places in WSA; fixed router's internal telepad utility

* corrected issue with unique control agent Actor names for Players; propagated change to all dynamic objects (not those instantiated at server time)

* test fix

* another test fix; this time, Travis is having trouble with it
This commit is contained in:
Fate-JH 2020-01-17 13:25:35 -05:00 • committed by GitHub
parent eebd5174a0
commit 3869785591
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 188 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/src/test/scala/objects/UtilityTest.scala
View file

@ -217,7 +217,7 @@ class UtilityInternalTelepadTest extends ActorTest {
system.actorOf(Props(classOf[UtilityTest.SetupControl], obj), "test") ! ""
receiveOne(Duration.create(100, "ms")) //consume and discard
assert(obj().Actor == ActorRef.noSender)
assert(obj().Actor != ActorRef.noSender)
assert(obj().asInstanceOf[Utility.InternalTelepad].Router.contains(veh.GUID))
}
}

4
common/src/test/scala/objects/number/UniqueNumberSystemTest.scala
View file

@ -187,14 +187,14 @@ class UniqueNumberSystemTest5 extends ActorTest() {
assert(src.CountUsed == 0)
uns ! Register(testObj, "pool2")
val msg1 = receiveOne(Duration.create(500, "ms"))
val msg1 = receiveOne(Duration.create(2000, "ms"))
assert(msg1.isInstanceOf[Success[_]])
assert(testObj.HasGUID)
assert(pool2.contains(testObj.GUID.guid))
assert(src.CountUsed == 1)
uns ! Unregister(testObj)
val msg2 = receiveOne(Duration.create(500, "ms"))
val msg2 = receiveOne(Duration.create(2000, "ms"))
assert(msg2.isInstanceOf[Success[_]])
assert(!testObj.HasGUID)
assert(src.CountUsed == 0)