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

6
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java
View File

@@ -1,6 +1,8 @@
package pp.mdga.server.automaton;
import pp.mdga.game.Color;
import pp.mdga.game.Piece;
import pp.mdga.game.PieceState;
import pp.mdga.game.Player;
import pp.mdga.message.client.*;
import pp.mdga.message.server.*;
@@ -50,6 +52,10 @@ public void initializeGame() {
for (var player : this.logic.getGame().getPlayers().values()) {
player.initialize();
player.addHandCard(this.logic.getGame().draw());
Piece piece = player.getWaitingArea()[0];
player.getWaitingArea()[0] = null;
piece.setState(PieceState.ACTIVE);
this.logic.getGame().getBoard().getInfield()[player.getStartNodeIndex()].setOccupant(piece);
}
}