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
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1646526ce1 - Show all commits

2
Projekte/mdga/model/src/main/java/pp/mdga/game/Player.java
View File

@@ -114,6 +114,8 @@ public void removeHandCard(PowerCard card) {
* @param piece as the piece which should be added to the waitingArea attribute of Player class as a Piece object. * @param piece as the piece which should be added to the waitingArea attribute of Player class as a Piece object.
*/ */
public void addWaitingPiece(Piece piece) { public void addWaitingPiece(Piece piece) {
piece.setState(PieceState.WAITING);
for (int i = 0; i < Resources.MAX_PIECES; i++) { for (int i = 0; i < Resources.MAX_PIECES; i++) {
if (this.waitingArea[i] == null) { if (this.waitingArea[i] == null) {
this.waitingArea[i] = piece; this.waitingArea[i] = piece;