Commit 4511c3df authored by Tristan MAISONNEUVE's avatar Tristan MAISONNEUVE
Browse files

Merge remote-tracking branch 'origin/master'

parents 0e978326 f2fe99e2
...@@ -65,8 +65,7 @@ public class Application { ...@@ -65,8 +65,7 @@ public class Application {
try { try {
jeu = pf.fc.getJeu(); jeu = pf.fc.getJeu();
System.out.println(jeu); System.out.println(jeu);
boolean bool = Network.joinGame(url,jeu,jaquie,fleet); Network.joinGame(url,jeu,jaquie,fleet);
System.out.println(bool);
System.out.println("pupute"); System.out.println("pupute");
} catch (UnirestException | UncompleteFleetException | BadCoordException e) { e.printStackTrace();} } catch (UnirestException | UncompleteFleetException | BadCoordException e) { e.printStackTrace();}
System.out.println("puuuuuute"); System.out.println("puuuuuute");
...@@ -122,6 +121,10 @@ public class Application { ...@@ -122,6 +121,10 @@ public class Application {
while (FenetreJeux.getCoco() != null) { while (FenetreJeux.getCoco() != null) {
try { try {
valtouche = Network.playOneTurn("http://172.26.82.18//api/v0", jeu, jaquie, FenetreJeux.getCoco()); valtouche = Network.playOneTurn("http://172.26.82.18//api/v0", jeu, jaquie, FenetreJeux.getCoco());
while (valtouche==-10) {
Network.playOneTurn("http://172.26.82.18//api/v0", jeu, jaquie, FenetreJeux.getCoco());
Thread.sleep(400);
}
} catch (UnirestException | BadCoordException e) { e.printStackTrace();} } catch (UnirestException | BadCoordException e) { e.printStackTrace();}
} }
break; break;
......
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