merge Development into test #27

Merged
j23f0712 merged 14 commits from development into dev/test 2024-12-01 21:56:50 +01:00
12 changed files with 14 additions and 48 deletions
Showing only changes of commit 42feca466d - Show all commits

View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState; import pp.mdga.server.automaton.game.TurnState;
public class ChoosePieceState extends TurnState { public class ChoosePieceState {
public ChoosePieceState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,6 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState; import pp.mdga.server.automaton.game.TurnState;
public class MovePieceState extends TurnState { public class MovePieceState {
public MovePieceState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState; import pp.mdga.server.automaton.game.TurnState;
public class PowerCardState extends TurnState { public class PowerCardState {
public PowerCardState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.TurnState; import pp.mdga.server.automaton.game.TurnState;
public class RollDiceState extends TurnState { public class RollDiceState {
public RollDiceState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState; import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class NoPieceState extends ChoosePieceState { public class NoPieceState {
public NoPieceState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState; import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class NoTurnState extends ChoosePieceState { public class NoTurnState {
public NoTurnState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,6 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState; import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class SelectPieceState extends ChoosePieceState { public class SelectPieceState {
public SelectPieceState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState; import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class StartPieceState extends ChoosePieceState { public class StartPieceState {
public StartPieceState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.ChoosePieceState; import pp.mdga.server.automaton.game.turn.ChoosePieceState;
public class WaitingPieceState extends ChoosePieceState { public class WaitingPieceState {
public WaitingPieceState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.RollDiceState; import pp.mdga.server.automaton.game.turn.RollDiceState;
public class FirstRollStateState extends RollDiceState { public class FirstRollStateState {
public FirstRollStateState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.RollDiceState; import pp.mdga.server.automaton.game.turn.RollDiceState;
public class SecondRollState extends RollDiceState { public class SecondRollState {
public SecondRollState(ServerGameLogic logic) {
super(logic);
}
} }

View File

@@ -3,8 +3,5 @@
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
import pp.mdga.server.automaton.game.turn.RollDiceState; import pp.mdga.server.automaton.game.turn.RollDiceState;
public class ThirdRollState extends RollDiceState { public class ThirdRollState {
public ThirdRollState(ServerGameLogic logic) {
super(logic);
}
} }