tslocum/bgammon
tslocum/bgammon
2
0
Fork 0
Code Issues 11 Pull requests Projects Releases Wiki Activity

Fix rerolling in acey-deucey games

Browse source
This commit is contained in:
Trevor Slocum 2023-12-11 10:52:48 -08:00
parent d4608ff3b3
commit f939d053a8
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkg/server/server.go
View file

@ -943,12 +943,9 @@ COMMANDS:
client.sendEvent(ev)
})
var skipBoard bool
if clientGame.Turn == 0 && clientGame.Roll1 != 0 && clientGame.Roll2 != 0 {
reroll := func() {
clientGame.eachClient(func(client *serverClient) {
clientGame.sendBoard(client)
})
clientGame.Roll1 = 0
clientGame.Roll2 = 0
if !clientGame.roll(clientGame.Turn) {
@ -964,8 +961,10 @@ COMMANDS:
ev.Player = string(clientGame.Player2.Name)
}
clientGame.eachClient(func(client *serverClient) {
clientGame.sendBoard(client)
client.sendEvent(ev)
})
skipBoard = true
}
if clientGame.Roll1 > clientGame.Roll2 {
@ -983,11 +982,13 @@ COMMANDS:
clientGame.Roll2 = 0
}
}
clientGame.eachClient(func(client *serverClient) {
if clientGame.Turn != 0 || !client.json {
clientGame.sendBoard(client)
}
})
if !skipBoard {
clientGame.eachClient(func(client *serverClient) {
if clientGame.Turn != 0 || !client.json {
clientGame.sendBoard(client)
}
})
}
case bgammon.CommandMove, "m", "mv":
if clientGame == nil {
cmd.client.sendEvent(&bgammon.EventFailedMove{