Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
naomod
Object-Oriented Software Analysis and Design (OOAD)
Projet 2020 - Not Alone
Commits
bddb7316
Commit
bddb7316
authored
Dec 09, 2020
by
Corentin Guillevic
Browse files
Small correction (adress to address) in game-service.thrift and in Conversion.java
parent
55aa7ca8
Changes
3
Hide whitespace changes
Inline
Side-by-side
not-alone-core/src/main/thrift/game-service.thrift
View file @
bddb7316
...
...
@@ -12,7 +12,7 @@ struct JoinRequest {
struct TPlayer {
1: string token,
2: string name,
3: string adress,
3: string ad
d
ress,
4: i32 port
}
...
...
not-alone-server/src/main/java/fr/univnantes/alma/server/game/utilitary/Conversion.java
View file @
bddb7316
...
...
@@ -385,7 +385,7 @@ public class Conversion {
}
public
static
User
toUser
(
TPlayer
tPlayer
)
{
return
new
User
(
tPlayer
.
getToken
(),
tPlayer
.
getName
(),
tPlayer
.
getAdress
(),
tPlayer
.
getPort
());
return
new
User
(
tPlayer
.
getToken
(),
tPlayer
.
getName
(),
tPlayer
.
getAd
d
ress
(),
tPlayer
.
getPort
());
}
/*************************************
...
...
not-alone-server/src/main/java/fr/univnantes/alma/server/handler/GameServiceHandler.java
View file @
bddb7316
...
...
@@ -39,7 +39,7 @@ public class GameServiceHandler implements GameService.Iface {
}
@Override
public
Response
sendStartGame
(
TPlayer
tPlayer
,
int
idCreature
,
TBoard
board
,
TColor
color
,
List
<
TCard
>
tPlaceCards
)
throws
TException
{
public
Response
sendStartGame
(
TPlayer
tPlayer
,
int
idCreature
,
TBoard
board
,
TColor
color
,
List
<
TCard
>
tPlaceCards
)
{
User
player
=
toUser
(
tPlayer
);
BoardDistribution
boardDistribution
=
Conversion
.
toBoardDistribution
(
board
);
BoardColor
boardColor
=
Conversion
.
toBoardColor
(
color
);
...
...
Write
Preview
Supports
Markdown
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