merge the new developmentbranch into the test branch #39
@@ -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
|
||||
|
||||
@@ -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<>();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user