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

2
Projekte/mdga/model/src/main/java/pp/mdga/client/GameState.java
View File

@@ -56,7 +56,7 @@ public void setState(GameStates newState){
if(this.state != null){ if(this.state != null){
this.state.exit(); this.state.exit();
} }
System.out.println("jetziger State:"+this.state + " new State:"+newState); System.out.println("CLIENT STATE old:" + this.state + " new:" + newState);
newState.enter(); newState.enter();
state = newState; state = newState;
} }

2
Projekte/mdga/model/src/main/java/pp/mdga/server/ServerGameLogic.java
View File

@@ -207,6 +207,8 @@ public CeremonyState getCeremonyState() {
* @param state as the new currentState attribute as a ServerState object. * @param state as the new currentState attribute as a ServerState object.
*/ */
public void setCurrentState(ServerState state) { public void setCurrentState(ServerState state) {
System.out.println("SERVER STATE old:" + this.currentState + " new:" + state);
if (this.currentState != null) { if (this.currentState != null) {
this.currentState.exit(); this.currentState.exit();
} }