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

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

@@ -67,7 +67,7 @@ public void received(JoinedLobbyMessage msg, int from) {
for (Map.Entry<Integer, Player> entry : this.logic.getGame().getPlayers().entrySet()) { for (Map.Entry<Integer, Player> entry : this.logic.getGame().getPlayers().entrySet()) {
this.logic.getServerSender().broadcast(new LobbyPlayerJoinedMessage(entry.getKey(), entry.getValue(), entry.getKey() == this.logic.getGame().getHost())); this.logic.getServerSender().broadcast(new LobbyPlayerJoinedMessage(entry.getKey(), entry.getValue(), entry.getKey() == this.logic.getGame().getHost()));
if(entry.getKey() != from) { if (entry.getKey() != from && entry.getValue().isReady()) {
this.logic.getServerSender().send(from, new UpdateReadyMessage(entry.getKey(), entry.getValue().isReady())); this.logic.getServerSender().send(from, new UpdateReadyMessage(entry.getKey(), entry.getValue().isReady()));
} }
} }
@@ -86,7 +86,8 @@ public void received(SelectTSKMessage msg, int from) {
this.logic.getServerSender().broadcast(new UpdateTSKMessage(from, Color.NONE, false)); this.logic.getServerSender().broadcast(new UpdateTSKMessage(from, Color.NONE, false));
this.logic.getGame().getPlayerById(from).setColor(msg.getColor()); this.logic.getGame().getPlayerById(from).setColor(msg.getColor());
this.logic.getServerSender().broadcast(new UpdateTSKMessage(from, msg.getColor(), true)); this.logic.getServerSender().broadcast(new UpdateTSKMessage(from, msg.getColor(), true));
} else { }
else {
this.logic.getServerSender().send(from, new IncorrectRequestMessage(0)); this.logic.getServerSender().send(from, new IncorrectRequestMessage(0));
} }
} }
@@ -116,10 +117,11 @@ public void received(LobbyReadyMessage msg, int from) {
if (this.logic.getGame().getPlayerById(from).getColor() == Color.NONE) { if (this.logic.getGame().getPlayerById(from).getColor() == Color.NONE) {
Color color = this.logic.getGame().getFirstUnusedColor(); Color color = this.logic.getGame().getFirstUnusedColor();
if (color != null) { if (color != Color.NONE) {
this.logic.getGame().getPlayerById(from).setColor(color); this.logic.getGame().getPlayerById(from).setColor(color);
this.logic.getServerSender().broadcast(new UpdateTSKMessage(from, color, true)); this.logic.getServerSender().broadcast(new UpdateTSKMessage(from, color, true));
} else { }
else {
this.logic.getServerSender().send(from, new IncorrectRequestMessage(1)); this.logic.getServerSender().send(from, new IncorrectRequestMessage(1));
} }
} }
@@ -153,7 +155,8 @@ public void received(StartGameMessage msg, int from) {
this.initializeGame(); this.initializeGame();
this.logic.getServerSender().broadcast(new ServerStartGameMessage(this.logic.getGame().getPlayersAsList(), this.logic.getGame().getBoard())); this.logic.getServerSender().broadcast(new ServerStartGameMessage(this.logic.getGame().getPlayersAsList(), this.logic.getGame().getBoard()));
this.logic.setCurrentState(this.logic.getGameState()); this.logic.setCurrentState(this.logic.getGameState());
} else { }
else {
this.logic.getServerSender().send(from, new IncorrectRequestMessage(5)); this.logic.getServerSender().send(from, new IncorrectRequestMessage(5));
} }
} }