Commit 7a806d0e authored by E201139E's avatar E201139E
Browse files

Merge branch 'main' of https://gitlab.univ-nantes.fr/E200206Q/projet-tutore into main

parents 56509895 708995b8
{
"pseudo":177013
p joue :86
p joue :92
p gagne :3
p perdu :8
}
\ No newline at end of file
......@@ -53,12 +53,11 @@ public class ButtonGrilleHautControleur implements ActionListener{
for(Player p : Network.listActivePlayers(HTTP_LOCALHOST)){
String[] n = p.getName().split(":");
boolean init = log.getPL() != log.getG().getInitiator();
String s = log.getG().getInitiator().getName()+init+log.getCompt();
String s = log.getG().getId()+log.getG().getInitiator().getName()+init+(log.getCompt()-1);
if(n.length == 2){
System.out.println("1:"+n[0]+"\n2:"+s);
//System.out.println("\1:"+s);
if(n[0] == s){
System.out.println("ok");
System.out.println("\1:"+s+"\n2:"+n[0]);
if(n[0].equals(s)){
System.out.println("ok:"+n[1]);
log.tir_recu(n[1], recup);
}
}
......@@ -140,7 +139,7 @@ public class ButtonGrilleHautControleur implements ActionListener{
}
boolean init = log.getPL() == log.getG().getInitiator();
String s = log.getG().getInitiator().getName()+init+log.getCompt()+":"+coords.toString();
String s = log.getG().getId()+log.getG().getInitiator().getName()+init+log.getCompt()+":"+coords.toString();
Network.suscribeNewPlayer(HTTP_LOCALHOST, new Player(s));
System.out.println("0:"+s);
log.incrCompt();
......
Markdown is supported
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