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

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2d7fddf09a - Show all commits

4
Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java
View File

@@ -673,12 +673,12 @@ public void pieceSelect(PieceControl pieceSelected) {
} }
if (!isSelected) { if (!isSelected) {
pieceSelected.select(); pieceSelected.select();
selectedPieceNodeMap.get(pieceSelected).select(); if(selectedPieceNodeMap.get(pieceSelected) != null) selectedPieceNodeMap.get(pieceSelected).select();
selectedOwnPiece = pieceSelected; selectedOwnPiece = pieceSelected;
} }
else { else {
pieceSelected.unSelect(); pieceSelected.unSelect();
selectedPieceNodeMap.get(pieceSelected).highlight(); if(selectedPieceNodeMap.get(pieceSelected) != null) selectedPieceNodeMap.get(pieceSelected).highlight();
selectedOwnPiece = null; selectedOwnPiece = null;
} }
} }