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

4
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java
View File

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

5
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/powercardstate/ChoosePowerCardState.java
View File

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