merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
257 changed files with 13614 additions and 2522 deletions
Showing only changes of commit 1646526ce1 - Show all commits

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.
*/
public void addWaitingPiece(Piece piece) {
piece.setState(PieceState.WAITING);
for (int i = 0; i < Resources.MAX_PIECES; i++) {
if (this.waitingArea[i] == null) {
this.waitingArea[i] = piece;