From 8dd697bb6631dda442cdec8dd8fc03a4fe57e903 Mon Sep 17 00:00:00 2001 From: Luca Conte Date: Mon, 23 Dec 2024 23:04:16 +0100 Subject: [PATCH 1/3] proper game closing --- src/AiPlayer.java | 1 + src/MainFrame.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/AiPlayer.java b/src/AiPlayer.java index 071f896..a1c9690 100644 --- a/src/AiPlayer.java +++ b/src/AiPlayer.java @@ -155,6 +155,7 @@ public abstract class AiPlayer extends LocalPlayer implements Runnable { while(i.hasNext()) { Thread thread = i.next(); try { + thread.interrupt(); thread.join(); i.remove(); } catch (InterruptedException e) { diff --git a/src/MainFrame.java b/src/MainFrame.java index 004c068..f327e0b 100644 --- a/src/MainFrame.java +++ b/src/MainFrame.java @@ -129,7 +129,7 @@ public class MainFrame extends JFrame { * @author Lucas Bronson, Peer Ole Wachtel, Luca Conte */ public void showPanelWin(String panelName, Player player){ - if(player != gameBoard.getP1()){ + if(gameBoard == null || player != gameBoard.getP1()){ return; } @@ -152,7 +152,7 @@ public class MainFrame extends JFrame { * @author Lucas Bronson, Peer Ole Wachtel, Luca Conte */ public void showPanelLose(String panelName, Player player){ - if(player != gameBoard.getP1()){ + if(gameBoard == null || player != gameBoard.getP1()){ return; } From 1b08b39105479d5868cbf38068a7f922f2f69a69 Mon Sep 17 00:00:00 2001 From: Luca Conte Date: Mon, 23 Dec 2024 23:12:43 +0100 Subject: [PATCH 2/3] don't repaint fields after game end --- src/BoardDisplay.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/BoardDisplay.java b/src/BoardDisplay.java index 5295ad7..d0eeedd 100644 --- a/src/BoardDisplay.java +++ b/src/BoardDisplay.java @@ -174,6 +174,7 @@ public class BoardDisplay extends JPanel { if(currentShip != null) { test = currentShip.getVirtualOccupiedPoints(mousePosition, horizontal); } + if (player == null || player.getBoard() == null) return; for(int i = 0; i < gridSize; i++) { for(int j = 0; j < gridSize; j++) { if(fields[i][j] == null) { From 175241395ef81e5a81acc8f344487110eb74d453 Mon Sep 17 00:00:00 2001 From: Luca Conte Date: Mon, 23 Dec 2024 23:12:48 +0100 Subject: [PATCH 3/3] add docs to makefile --- makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/makefile b/makefile index cc59d0d..ec0993a 100644 --- a/makefile +++ b/makefile @@ -29,6 +29,9 @@ test-jar: jar # $(JR) -cp "$(OUT_DIR)/:$(LIB_DIR)/*" $(MAIN_CLASS) $(JR) -jar $(OUT_DIR)/$(JAR_NAME) +docs: + javadoc -cp "$(LIB_DIR)/*" -d "docs" $(SRC_DIR)/*.java + test: classfiles $(JR) -cp "$(OUT_DIR)$(SEPERATOR)$(LIB_DIR)/*" $(MAIN_CLASS)