Commit 820ea067 authored by Thibault Chiche's avatar Thibault Chiche
Browse files

Merge branch 'develop' of https://gitlab.utc.fr/qdruault/lo23-project into develop

parents b058318f d8aac4f0
......@@ -309,11 +309,11 @@ public class GameMediator {
System.out.println("add role "+role);
System.out.println("add Urole "+role);
this.getCurrentGame().addUser(user, role);
if (this.dataFacade.getComfacade() != null) {
this.dataFacade.getComfacade().joinGameResponse(true, id, this.currentGame);
this.dataFacade.getComfacade().joinGameResponse(true, user.getId(), this.currentGame);
}
} else {
......
......@@ -87,8 +87,7 @@ public abstract class Game extends SerializableEntity {
this.spectators.add(user);
System.out.println("spectator "+user.getId());
} else {
throw new DataException("Data : given role is not known.");
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment