merge dev int test #29

Merged
j23f0712 merged 4 commits from development into dev/test 2024-12-01 23:33:43 +01:00
4 changed files with 42 additions and 6 deletions
Showing only changes of commit e68369074f - Show all commits

View File

@@ -32,6 +32,7 @@ public RollDiceState(TurnState turnAutomaton, ServerGameLogic logic) {
this.firstRollState = new FirstRollState(this, logic);
this.secondRollState = new SecondRollState(this, logic);
this.thirdRollState = new ThirdRollState(this, logic);
this.setCurrentState(this.firstRollState);
}
@Override
@@ -58,7 +59,7 @@ public RollDiceAutomatonState getCurrentState() {
*
* @return firstRollState as a FirstRollState object.
*/
public FirstRollState getFirstRollStateState() {
public FirstRollState getFirstRollState() {
return this.firstRollState;
}