can we call this rewrite 4.5
This commit is contained in:
parent
2d3993452b
commit
a0171b1de6
9 changed files with 128 additions and 120 deletions
|
|
@ -14,7 +14,7 @@ pub fn join_or_create_lobby(ctx: &ReducerContext, mut lobby_id: u32) -> Result<(
|
|||
.find(ctx.sender)
|
||||
.ok_or(format!("cannot find player {}", ctx.sender))?;
|
||||
|
||||
if lobby_id == 0 {
|
||||
if lobby_id == 0 && player.lobby_id == 0 {
|
||||
// TODO check first if player is already in a lobby
|
||||
|
||||
let lobby = ctx.db.lobby().insert(Lobby {
|
||||
|
|
@ -27,10 +27,17 @@ pub fn join_or_create_lobby(ctx: &ReducerContext, mut lobby_id: u32) -> Result<(
|
|||
info!("created lobby: {}", lobby.id);
|
||||
|
||||
lobby_id = lobby.id;
|
||||
player.lobby_id = lobby_id;
|
||||
} else {
|
||||
let lobby = ctx
|
||||
.db
|
||||
.lobby()
|
||||
.id()
|
||||
.find(player.lobby_id)
|
||||
.ok_or(format!("can't find lobby {}", player.lobby_id))?;
|
||||
lobby_id = lobby.id;
|
||||
}
|
||||
|
||||
player.lobby_id = lobby_id;
|
||||
|
||||
let player = ctx.db.player().identity().update(player);
|
||||
|
||||
info!("player {} joined lobby {}", player.id, lobby_id);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue