peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Development merge #36

Merged
j23f0779 merged 2 commits from development into dev/model 2024-12-06 10:55:19 +01:00
Conversation 4 Commits 2 Files Changed 2 +7 -5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,3 +1,5 @@
.run/
.gradle .gradle
build/ build/
#!gradle/wrapper/gradle-wrapper.jar #!gradle/wrapper/gradle-wrapper.jar

10
Projekte/mdga/client/src/main/java/pp/mdga/client/ModelSynchronizer.java
View File

@@ -88,17 +88,17 @@ public void confirm() {
GameView gameView = (GameView) app.getView(); GameView gameView = (GameView) app.getView();
if(a != null && b != null) { if(a != null && b != null) {
selectPiece(a); app.getGameLogic().selectPiece(a);
selectPiece(b); app.getGameLogic().selectPiece(b);
gameView.getBoardHandler().clearSelectable(); gameView.getBoardHandler().clearSelectable();
} else if (a != null) { } else if (a != null) {
selectPiece(a); app.getGameLogic().selectPiece(a);
gameView.getBoardHandler().clearSelectable(); gameView.getBoardHandler().clearSelectable();
} else { } else {
if(null == card) { if(null == card) {
selectCard(null); app.getGameLogic().selectCard(null);
} else { } else {
selectCard(card); app.getGameLogic().selectCard(card);
gameView.getGuiHandler().clearSelectableCards(); gameView.getGuiHandler().clearSelectableCards();
} }
} }