Fix infinite loop and rare crash

cswinter · Mar 17, 2019 · 7f9abcd · 7f9abcd
1 parent b3a82da
commit 7f9abcd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/core/jvm/src/main/scala/cwinter/codecraft/core/multiplayer/Server.scala b/core/jvm/src/main/scala/cwinter/codecraft/core/multiplayer/Server.scala
@@ -216,8 +216,10 @@ class MultiplayerServer(
     context.system.scheduler.scheduleOnce(10 minutes, new Runnable {
       override def run(): Unit = {
         if (!hasStartedMatchmaking(rawConnection)) {
-          context.stop(rawConnection)
-          context.stop(websocketActor)
+          if (context != null) {
+            context.stop(rawConnection)
+            context.stop(websocketActor)
+          }
           connectionInfo -= connection.websocketActor
         }
       }

diff --git a/core/jvm/src/test/scala/cwinter/codecraft/core/game/TightCollisionTest.scala b/core/jvm/src/test/scala/cwinter/codecraft/core/game/TightCollisionTest.scala
@@ -33,7 +33,7 @@ class TightCollisionTest extends FlatSpec with Matchers {
     val runFor10Steps = Future {
       simulator.run(10)
     }
-    Await.result(runFor10Steps, 1.seconds)
+    Await.result(runFor10Steps, 5.seconds)
   }
 
   // TODO: fix this bug and enable test

diff --git a/core/shared/src/main/scala/cwinter/codecraft/core/objects/drone/ComputedDroneDynamics.scala b/core/shared/src/main/scala/cwinter/codecraft/core/objects/drone/ComputedDroneDynamics.scala
@@ -25,6 +25,7 @@ private[core] class ComputedDroneDynamics(
   private[drone] var isStunned: Boolean = false
   private var oldPos = pos
   private var oldOrientation = orientation
+  private var collisionCount = 0;
 
 
   def setPosition(value: Vector2): Unit = pos = value
@@ -93,6 +94,7 @@ private[core] class ComputedDroneDynamics(
   }
 
   def recomputeVelocity(): Unit = {
+    collisionCount = 0
     velocity =
       if (isStunned) {
         if (velocity.length <= maxSpeed * 0.10f) {
@@ -138,6 +140,8 @@ private[core] class ComputedDroneDynamics(
     if (dx <= dy && xCollisionPossible) velocity = velocity.copy(_x = -velocity.x)
     else velocity = velocity.copy(_y = -velocity.y)
     isStunned = true
+    collisionCount += 1
+    if (collisionCount > 20) velocity = Vector2.Null
   }
 
   override def handleObjectCollision(other: ConstantVelocityDynamics): Unit = {
@@ -155,6 +159,9 @@ private[core] class ComputedDroneDynamics(
         isStunned = true
         other.isStunned = true
 
+        collisionCount += 1
+        if (collisionCount > 20) velocity = Vector2.Null
+
         drone.collidedWith(other.drone)
         other.drone.collidedWith(drone)
       case missile: MissileDynamics =>