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

2
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/TurnAutomatonState.java
View File

@@ -13,7 +13,7 @@ public abstract class TurnAutomatonState extends ServerState {
/** /**
* Constructs a server state of the specified game logic. * Constructs a server state of the specified game logic.
* *
* @param turnAutomaton as the automaton of the turn state as a GameState object. * @param turnAutomaton as the automaton of the turn state as a TurnState object.
* @param logic the game logic * @param logic the game logic
*/ */
public TurnAutomatonState(TurnState turnAutomaton, ServerGameLogic logic) { public TurnAutomatonState(TurnState turnAutomaton, ServerGameLogic logic) {