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

10
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/AnimationState.java
View File

@@ -1,16 +1,14 @@
package pp.mdga.server.automaton.game; package pp.mdga.server.automaton.game;
import pp.mdga.message.client.AnimationEndMessage; import pp.mdga.message.client.AnimationEndMessage;
import pp.mdga.message.server.DiceNowMessage;
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.GameState; import pp.mdga.server.automaton.GameState;
import java.util.HashMap; import java.util.HashSet;
import java.util.Map; import java.util.Set;
/** /**
* This class represents the animation state of the game state. * This class represents the animation state of the game state.
*
*/ */
public class AnimationState extends GameAutomatonState { public class AnimationState extends GameAutomatonState {
/** /**
@@ -21,7 +19,7 @@ public class AnimationState extends GameAutomatonState {
/** /**
* Create AnimationState attributes. * Create AnimationState attributes.
*/ */
private final Map<Integer, Boolean> messageReceived = new HashMap<>(); private final Set<Integer> messageReceived = new HashSet<>();
/** /**
* Constructs a server state of the specified game logic. * Constructs a server state of the specified game logic.
@@ -53,7 +51,7 @@ public void exit() {
*/ */
@Override @Override
public void received(AnimationEndMessage msg, int from) { public void received(AnimationEndMessage msg, int from) {
this.messageReceived.put(from, true); this.messageReceived.add(from);
if (this.messageReceived.size() == this.logic.getGame().getPlayers().size()) { if (this.messageReceived.size() == this.logic.getGame().getPlayers().size()) {
this.gameAutomaton.setCurrentState(this.gameAutomaton.getTurnState()); this.gameAutomaton.setCurrentState(this.gameAutomaton.getTurnState());
this.gameAutomaton.getTurnState().setCurrentState(this.gameAutomaton.getTurnState().getPowerCardState()); this.gameAutomaton.getTurnState().setCurrentState(this.gameAutomaton.getTurnState().getPowerCardState());