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 +4 -1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5b9bc7aa36 - Show all commits

5
Projekte/mdga/model/src/main/java/pp/mdga/game/Piece.java
View File

@@ -35,12 +35,15 @@ public class Piece {
* @param color the color of the piece * @param color the color of the piece
* @param state the state of the piece * @param state the state of the piece
*/ */
public Piece(Color color, PieceState state, int id) { public Piece(Color color, PieceState state) {
this.color = color; this.color = color;
this.state = state; this.state = state;
shield = ShieldState.NONE; shield = ShieldState.NONE;
} }
/**
* Constructor.
*/
private Piece() { private Piece() {
color = Color.NONE; color = Color.NONE;
state = PieceState.WAITING; state = PieceState.WAITING;