From 0adba36150d7766d4ced1d45904183c9f9d07f8e Mon Sep 17 00:00:00 2001 From: loveb Date: Tue, 3 May 2022 15:08:04 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84ndra=20fr=C3=A5n=20stream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/schack/Piece.java | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/src/schack/Piece.java b/src/schack/Piece.java index f15e55f..2d02516 100644 --- a/src/schack/Piece.java +++ b/src/schack/Piece.java @@ -174,38 +174,22 @@ public abstract class Piece { } boolean checkIfSchack(Point pos, Piece[][] pieces) { - boolean ourColor = this.isWhite(); Piece selectedPiece = this; ArrayList attacks = new ArrayList<>(); // Fråga alla pjäser vart de kan gå/ta - Arrays.stream(pieces).forEach(array -> { - Arrays.stream(array).filter(piece -> piece != null && piece.isWhite() != this.isWhite()).forEach(piece -> { - attacks.addAll(piece.validAttacks(pieces)); - }); - }); - - /* for (Piece[] pieceArr : pieces) { + for (Piece[] pieceArr : pieces) { for (Piece piece : pieceArr) { - // Ifall det är tomrum skippa - if (piece == null) { - continue; - } else if (piece.isWhite() == ourColor) { - continue; + if (piece != null && piece.isWhite() != this.isWhite()) { + attacks.addAll(piece.validAttacks(pieces)); } - - // Lägg till alla attacker för mostståndaren - attacks.addAll(piece.validAttacks(pieces)); } - }*/ - + } + // Kollar ifall kungen står i schack just nu for (Point attack : attacks) { Piece attacked = pieces[attack.x][attack.y]; - if (attacked == null) { - continue; - } - if (attacked.supremeRuler) { + if (attacked != null && attacked.supremeRuler) { return true; } }