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 +14112 -2678
267 changed files with 14112 additions and 2678 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bf3d800c10 - Show all commits

8
Projekte/mdga/model/src/main/java/pp/mdga/visitor/ServerCardVisitor.java
View File

@@ -41,7 +41,13 @@ public ServerCardVisitor(ServerGameLogic logic) {
*/
@Override
public void visit(TurboCard card) {
this.cards.add(card);
for (Piece piece : this.logic.getGame().getPlayerByColor(this.logic.getGame().getActiveColor()).getPieces()) {
if (piece.getState() == PieceState.ACTIVE) {
if (!this.cards.contains(card)) {
this.cards.add(card);
}
}
}
}
/**