refactor(plugin): move isObstructed to Board & remove Corner.asSet

Author: xeruf

plugin/src/shared/sc/plugin2021/Board.kt

@@ -16,7 +16,11 @@ class Board(
 
     /** Prüft, ob alle Felder leer sind. */
     fun isEmpty() = gameField.all { it.all { it == FieldContent.EMPTY } }
-
+    
+    /** Prüft, ob auf dieser [position] bereits eine Spielerfarbe liegt. */
+    fun isObstructed(position: Coordinates): Boolean =
+            this[position].content != FieldContent.EMPTY
+    
     /**
      * Gibt das Feld an den gegebenen Koordinaten zurück.
      * @see get
@@ -88,9 +92,4 @@ enum class Corner(val position: Coordinates) {
 
     /** Berechne die Koordinaten, die ein Stein haben muss, um in der entsprechenden Ecke platziert zu werden. */
     abstract fun align(area: Vector): Coordinates
-    
-    companion object {
-        /** Gib eine Sammlung der vier Ecken als [Set] zurück. */
-        fun asSet(): Set<Coordinates> = values().map { it.position }.toSet()
-    }
 }

plugin/src/shared/sc/plugin2021/util/GameRuleLogic.kt

@@ -138,7 +138,7 @@ object GameRuleLogic {
                 throw InvalidMoveException("Field $it is out of bounds", move)
             }
             // Checks if a part of the piece is obstructed
-            if (isObstructed(board, it))
+            if (board.isObstructed(it))
                 throw InvalidMoveException("Field $it already belongs to ${board[it].content}", move)
             // Checks if a part of the piece would border on another piece of same color
             if (bordersOnColor(board, it, move.color))
@@ -163,11 +163,6 @@ object GameRuleLogic {
             throw InvalidMoveException("Can't Skip on first round", SkipMove(gameState.currentColor))
     }
 
-    /** Check if the given [position] is already obstructed by another piece. */
-    @JvmStatic
-    private fun isObstructed(board: Board, position: Coordinates): Boolean =
-            board[position].content != FieldContent.EMPTY
-    
     /** Check if the given [position] already borders on another piece of same [color]. */
     @JvmStatic
     private fun bordersOnColor(board: Board, position: Coordinates, color: Color): Boolean = listOf(
@@ -195,7 +190,7 @@ object GameRuleLogic {
     /** Return true if the given [Coordinates] are a corner. */
     @JvmStatic
     private fun isOnCorner(position: Coordinates): Boolean =
-            Corner.asSet().contains(position)
+            Corner.values().any { it.position == position }
 
     /** Gib zurück, ob sich der [GameState] noch in der ersten Runde befindet. */
     @JvmStatic