From 7ef06f2440be773c6600aab5d7782a912656668d Mon Sep 17 00:00:00 2001 From: Felix Koppe Date: Sun, 6 Oct 2024 22:09:45 +0200 Subject: [PATCH] Fix logic error --- .../main/java/pp/battleship/game/server/ServerGameLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projekte/battleship/model/src/main/java/pp/battleship/game/server/ServerGameLogic.java b/Projekte/battleship/model/src/main/java/pp/battleship/game/server/ServerGameLogic.java index f761a5a8..4c7b697e 100644 --- a/Projekte/battleship/model/src/main/java/pp/battleship/game/server/ServerGameLogic.java +++ b/Projekte/battleship/model/src/main/java/pp/battleship/game/server/ServerGameLogic.java @@ -201,7 +201,7 @@ void playerReady(Player player, List ships) { private boolean checkShips(Player player, List ships) { for(Battleship ship : ships) { for(Battleship other : ships) { - if(ship.collidesWith(other)) { + if(ship.collidesWith(other) && !ship.equals(other)) { return false; } }