Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
David LELIEVRE
projetS2-15-AL
Commits
7c9c6d1a
Commit
7c9c6d1a
authored
Jun 25, 2021
by
jwars62
Browse files
com
parent
0ca30dc2
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/controleur/ButtonGrilleHautControleur.java
View file @
7c9c6d1a
...
@@ -53,7 +53,7 @@ public class ButtonGrilleHautControleur implements ActionListener{
...
@@ -53,7 +53,7 @@ public class ButtonGrilleHautControleur implements ActionListener{
for
(
Player
p
:
Network
.
listActivePlayers
(
HTTP_LOCALHOST
)){
for
(
Player
p
:
Network
.
listActivePlayers
(
HTTP_LOCALHOST
)){
String
[]
n
=
p
.
getName
().
split
(
":"
);
String
[]
n
=
p
.
getName
().
split
(
":"
);
boolean
init
=
log
.
getPL
()
!=
log
.
getG
().
getInitiator
();
boolean
init
=
log
.
getPL
()
!=
log
.
getG
().
getInitiator
();
String
s
=
log
.
getG
().
getInitiator
().
getName
()+
init
+(
log
.
getCompt
()-
1
);
String
s
=
log
.
getG
().
getId
()+
log
.
getG
().
getInitiator
().
getName
()+
init
+(
log
.
getCompt
()-
1
);
if
(
n
.
length
==
2
){
if
(
n
.
length
==
2
){
//System.out.println("\1:"+s);
//System.out.println("\1:"+s);
if
(
n
[
0
].
equals
(
s
)){
if
(
n
[
0
].
equals
(
s
)){
...
@@ -139,7 +139,7 @@ public class ButtonGrilleHautControleur implements ActionListener{
...
@@ -139,7 +139,7 @@ public class ButtonGrilleHautControleur implements ActionListener{
}
}
boolean
init
=
log
.
getPL
()
==
log
.
getG
().
getInitiator
();
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
));
Network
.
suscribeNewPlayer
(
HTTP_LOCALHOST
,
new
Player
(
s
));
System
.
out
.
println
(
"0:"
+
s
);
System
.
out
.
println
(
"0:"
+
s
);
log
.
incrCompt
();
log
.
incrCompt
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment