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

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

@@ -192,7 +192,8 @@ public void received(MoveMessage msg){
*/ */
@Override @Override
public void received(CeremonyMessage msg){ public void received(CeremonyMessage msg){
state.received(msg); logic.addNotification(createCeremonyNotification());
logic.setState(logic.getCeremony());
} }
/** /**