HSH/programmieren-projekt
HSH
/
programmieren-projekt
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

game-end-stuff #29

Merged
lgc merged 3 commits from game-end-stuff into main 2024-12-23 22:13:58 +00:00
Conversation 0 Commits 3 Files Changed 4 +3 -2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8dd697bb66 - Show all commits

1
src/AiPlayer.java
View File

@ -155,6 +155,7 @@ public abstract class AiPlayer extends LocalPlayer implements Runnable {
while(i.hasNext()) { while(i.hasNext()) {
Thread thread = i.next(); Thread thread = i.next();
try { try {
thread.interrupt();
thread.join(); thread.join();
i.remove(); i.remove();
} catch (InterruptedException e) { } catch (InterruptedException e) {

4
src/MainFrame.java
View File

@ -129,7 +129,7 @@ public class MainFrame extends JFrame {
* @author Lucas Bronson, Peer Ole Wachtel, Luca Conte * @author Lucas Bronson, Peer Ole Wachtel, Luca Conte
*/ */
public void showPanelWin(String panelName, Player player){ public void showPanelWin(String panelName, Player player){
if(player != gameBoard.getP1()){ if(gameBoard == null || player != gameBoard.getP1()){
return; return;
} }
@ -152,7 +152,7 @@ public class MainFrame extends JFrame {
* @author Lucas Bronson, Peer Ole Wachtel, Luca Conte * @author Lucas Bronson, Peer Ole Wachtel, Luca Conte
*/ */
public void showPanelLose(String panelName, Player player){ public void showPanelLose(String panelName, Player player){
if(player != gameBoard.getP1()){ if(gameBoard == null || player != gameBoard.getP1()){
return; return;
} }