#83: Bug fix: Bots receives skipped-turn-event events while dead

VERSIONS.MD

@@ -5,6 +5,8 @@
 - Bot API:
     - #80: Fixed a major bug causing the body, gun, and radar to move in a wrong angle, which could be seen with
       the Walls sample bot.
+- Server:
+    - #83: Bots receives skipped-turn-event events while dead.
 
 #### 🚀 Improvements
 

server/src/main/kotlin/dev/robocode/tankroyale/server/core/GameServer.kt

@@ -538,8 +538,12 @@ class GameServer(
     private fun getParticipantsThatSkippedTurn(): Collection<WebSocket> =
         mutableListOf<WebSocket>().apply {
             participants.forEach { participant ->
-                // Check if no intent was received from the participant during the turn
-                if (botIntents[participant] == null) this += participant
+                participantIds[participant]?.let {
+                    // Check if no intent was received from the (alive) participant during the turn
+                    if (modelUpdater?.isAlive(it) == true && botIntents[participant] == null) {
+                        this += participant
+                    }
+                }
             }
         }
 

server/src/main/kotlin/dev/robocode/tankroyale/server/core/ModelUpdater.kt

@@ -76,6 +76,8 @@ class ModelUpdater(
     /** The number of rounds played so far */
     internal val numberOfRounds: Int get() = gameState.rounds.size
 
+    internal fun isAlive(botId: BotId) = botsMap[botId]?.isAlive ?: false
+
     /**
      * Updates game state.
      * @param botIntents is the bot intents, which gives instructions to the game from the individual bots.