merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
185 changed files with 4652 additions and 1926 deletions
Showing only changes of commit 322d539cfd - Show all commits

View File

@@ -5,6 +5,8 @@
import pp.mdga.client.gamestate.TurnState;
import pp.mdga.message.server.DieMessage;
import pp.mdga.message.server.NoTurnMessage;
import pp.mdga.notification.DiceNowNotification;
import pp.mdga.notification.RollDiceNotification;
public class RollDiceState extends TurnStates {
@@ -17,7 +19,7 @@ public RollDiceState(ClientState parent, ClientGameLogic logic) {
@Override
public void enter() {
logic.addNotification(new DiceNowNotification());
}
@Override

View File

@@ -22,7 +22,7 @@
public class ChoosePowerCardState extends PowerCardStates {
private final PowerCardState parent;
private ArrayList<PowerCard> possibleCards;
private ArrayList<PowerCard> possibleCards = new ArrayList<>();
/**
* Constructor
@@ -39,7 +39,6 @@ public ChoosePowerCardState(ClientState parent, ClientGameLogic logic) {
*/
@Override
public void enter() {
possibleCards = new ArrayList<>();
}
/**
@@ -47,7 +46,7 @@ public void enter() {
*/
@Override
public void exit() {
possibleCards = null;
possibleCards = new ArrayList<>();
}
/**