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

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

@@ -178,7 +178,7 @@ public boolean hasPieceInWaitingArea(){
public int getHomeIndexOfPiece(Piece piece) { public int getHomeIndexOfPiece(Piece piece) {
for (int i = 0; i < Resources.MAX_PIECES; i++) { for (int i = 0; i < Resources.MAX_PIECES; i++) {
if (this.homeNodes[i].getOccupant().equals(piece)) { if (piece.equals(this.homeNodes[i].getOccupant())) {
return i; return i;
} }
} }