refactor(Game): calculate winner in AbstractGame

Author: xeruf

plugin/src/main/kotlin/sc/plugin2022/Game.kt

@@ -42,9 +42,6 @@ class Game(override val currentState: GameState = GameState()): AbstractGame(Gam
         return player
     }
 
-    override val winner: ITeam?
-        get() = players.singleOrNull { !it.hasViolated() }?.team ?: checkWinCondition()?.winner
-    
     override val playerScores: MutableList<PlayerScore>
         get() = players.mapTo(ArrayList(players.size)) { getScoreFor(it) }
 
@@ -58,7 +55,6 @@ class Game(override val currentState: GameState = GameState()): AbstractGame(Gam
      */
     override fun checkWinCondition(): WinCondition? {
         if (!isGameOver) return null
-        
         return Team.values().toList().maxByNoEqual(currentState::getPointsForTeam)?.let {
             WinCondition(it, WinReason.DIFFERING_SCORES)
         } ?: run {
@@ -67,6 +63,7 @@ class Game(override val currentState: GameState = GameState()): AbstractGame(Gam
                 fun dist(c: Coordinates) = abs(c.x - team.startLine)
                 lightPieces.filterValues { it.team == team }.keys.map(::dist).sortedDescending()
             }
+            logger.trace("checkWinCondition TeamPositions: {}", teamPositions)
             (0 until teamPositions.values.minOf { it.size }).mapNotNull { index ->
                 teamPositions.entries.maxByNoEqual { it.value[index] }?.key
             }.firstOrNull().let {

sdk/src/main/server-api/sc/framework/plugins/AbstractGame.kt

@@ -4,6 +4,7 @@ import org.slf4j.LoggerFactory
 import sc.api.plugins.IGameInstance
 import sc.api.plugins.IGameState
 import sc.api.plugins.IMove
+import sc.api.plugins.ITeam
 import sc.api.plugins.exceptions.GameLogicException
 import sc.api.plugins.exceptions.NotYourTurnException
 import sc.api.plugins.host.IGameListener
@@ -26,6 +27,10 @@ abstract class AbstractGame(override val pluginUUID: String) : IGameInstance, Pa
 
     private var moveRequestTimeout: ActionTimeout? = null
 
+    override val winner: ITeam?
+        get() = players.singleOrNull { !it.hasViolated() && !it.hasLeft() }?.team ?:
+                checkWinCondition()?.also { logger.trace("No Winner via violation, WinCondition: {}", it) }?.winner
+    
     /** Pause the game after current turn has finished or continue playing. */
     override var isPaused = false
         set(value) {

server/src/test/java/sc/server/gaming/GameRoomTest.kt

@@ -50,7 +50,6 @@ val minimalReplay = """
             </score>
           </entry>
         </scores>
-        <winner team="ONE"/>
       </data>
     </room>
     </protocol>""".trimIndent()
@@ -74,6 +73,7 @@ class GameRoomTest: WordSpec({
             room.onGameOver(playersScores)
             room.result.isRegular shouldBe true
             room.result.scores shouldContainExactly playersScores
+            room.result.winner shouldBe null
             room.isOver shouldBe true
         }
         "save a correct replay" {

server/src/test/java/sc/server/plugins/TestGame.kt

@@ -16,9 +16,6 @@ data class TestGame(
     override val playerScores: List<PlayerScore>
         get() = players.map { getScoreFor(it) }
 
-    override val winner: ITeam?
-        get() = players.firstOrNull { !it.hasViolated() && !it.hasLeft() }?.team
-    
     override fun onRoundBasedAction(move: IMove) {
         if (move !is TestMove)
             throw InvalidMoveException(object: IMoveMistake {