diff --git a/client/src/plugins/engine/parseSyncData.js b/client/src/plugins/engine/parseSyncData.js index 7f3e5bd..61910e5 100644 --- a/client/src/plugins/engine/parseSyncData.js +++ b/client/src/plugins/engine/parseSyncData.js @@ -5,8 +5,4 @@ export default function(data) { store.commit('game/setStateAndPhase', data.game) store.commit('players/setPlayers', data.game) store.commit('round/setRound', data.game) - - if (data.game.state === 'play' && data.game.phase === 'reveal-start-2') { - store.commit('selection/clearSelection') - } } diff --git a/server/src/game/populateGetRoundInfo.go b/server/src/game/populateGetRoundInfo.go index 29686e0..fa442d8 100644 --- a/server/src/game/populateGetRoundInfo.go +++ b/server/src/game/populateGetRoundInfo.go @@ -50,10 +50,6 @@ func (gm *Game) getSelections() map[string]bool { } func (gm *Game) getRevelation() *syncdata.Revelation { - if gm.state != STATE_PLAY || gm.phase != PHASE_REVEAL_SHOW_COUNT { - return nil - } - revelation := syncdata.Revelation{ Votes: gm.round.revelation.votes, } diff --git a/server/src/game/revealShowCount.go b/server/src/game/revealShowCount.go index 46aee73..0b1678f 100644 --- a/server/src/game/revealShowCount.go +++ b/server/src/game/revealShowCount.go @@ -15,9 +15,6 @@ func (gm *Game) revealShowCount() { fmt.Println(err) return } - gm.round.revelation = Revelation{ - votes: make(map[string][]string, 0), - } gm.notifyClients() time.Sleep(1 * time.Second) diff --git a/server/src/game/runRound.go b/server/src/game/runRound.go index 8a896eb..0166b4e 100644 --- a/server/src/game/runRound.go +++ b/server/src/game/runRound.go @@ -28,6 +28,9 @@ func (gm *Game) setupRound() { gm.round = Round{ selections: make(map[string]string, 0), + revelation: Revelation{ + votes: make(map[string][]string, 0), + }, } }