peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'dev/model' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/model

Browse Source
This commit is contained in:
Daniel Grigencha
2024-12-06 04:28:40 +01:00
parent 9c4f2387ee 0368ec8541
commit 322d539cfd
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.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

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 {
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<>();
}
/**