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

11
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/PowerCardState.java
View File

@@ -3,7 +3,7 @@
import pp.mdga.game.Piece; import pp.mdga.game.Piece;
import pp.mdga.game.card.PowerCard; import pp.mdga.game.card.PowerCard;
import pp.mdga.message.server.DiceNowMessage; import pp.mdga.message.server.DiceNowMessage;
import pp.mdga.message.server.PossibleCardMessage; import pp.mdga.message.server.PossibleCardsMessage;
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState; import pp.mdga.server.automaton.game.TurnState;
import pp.mdga.server.automaton.game.turn.powercard.ChoosePowerCardState; import pp.mdga.server.automaton.game.turn.powercard.ChoosePowerCardState;
@@ -56,16 +56,17 @@ public PowerCardState(TurnState turnAutomaton, ServerGameLogic logic) {
@Override @Override
public void enter() { public void enter() {
LOGGER.log(System.Logger.Level.DEBUG, "Exited PowerCardState state."); LOGGER.log(System.Logger.Level.DEBUG, "Exited PowerCardState state.");
this.visitor = new ServerCardVisitor(this.turnAutomaton.getPlayer()); this.visitor = new ServerCardVisitor(this.logic);
for (PowerCard card: this.turnAutomaton.getPlayer().getHandCards()) { for (PowerCard card : this.turnAutomaton.getPlayer().getHandCards()) {
card.accept(this.visitor); card.accept(this.visitor);
} }
if (this.visitor.getCards().isEmpty()) { if (this.visitor.getCards().isEmpty()) {
this.logic.getServerSender().send(this.logic.getGame().getActivePlayerId(), new DiceNowMessage()); this.logic.getServerSender().send(this.logic.getGame().getActivePlayerId(), new DiceNowMessage());
this.turnAutomaton.setCurrentState(this.turnAutomaton.getRollDiceState()); this.turnAutomaton.setCurrentState(this.turnAutomaton.getRollDiceState());
} else { }
this.logic.getServerSender().send(this.logic.getGame().getActivePlayerId(), new PossibleCardMessage(this.visitor.getCards())); else {
this.logic.getServerSender().send(this.logic.getGame().getActivePlayerId(), new PossibleCardsMessage(this.visitor.getCards()));
} }
} }