Merge pull request #61 from openbase/bugfix/60-agents-can-shift-out-o…

…f-map Fixed agents leaving map
openbase · Mar 9, 2024 · 1b12643 · 1b12643
2 parents 49b5731 + ad77eb6
commit 1b12643
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/kotlin/org/openbase/planetsudo/level/levelobjects/Agent.kt b/src/main/kotlin/org/openbase/planetsudo/level/levelobjects/Agent.kt
@@ -308,24 +308,26 @@ class Agent(
             // move and apply new direction
             moveForward()
             direction.apply { directionController() }
+            if (level.collisionDetected(bounds)) { // Is collied with wall?
+                kill()
+            }
 
             // shift
             if (isShifting) {
                 (0..SHIFT_EXTRA_SPEED).forEach { _ ->
                     if (isCollisionDetected) {
-                        return@performAction
+                        kill()
                     }
                     if (consumeTonicForShifting()) {
                         // move and apply new direction
                         moveForward()
                         direction.apply { directionController() }
                     }
+                    if (level.collisionDetected(bounds)) { // Is collied with wall?
+                        kill()
+                    }
                 }
             }
-
-            if (level.collisionDetected(bounds)) { // Is collied with wall?
-                kill()
-            }
         }
     }