From d6d0800566d64368e16e7ffb81e411a058513b49 Mon Sep 17 00:00:00 2001 From: ntr Date: Thu, 19 Sep 2019 21:55:15 +1000 Subject: [PATCH 1/2] v1.4.7 --- VERSION | 2 +- acp/package.json | 2 +- client/package.json | 2 +- ops/package.json | 2 +- server/Cargo.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 7b5753f5..b000a6a0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.6 \ No newline at end of file +1.4.7 \ No newline at end of file diff --git a/acp/package.json b/acp/package.json index 9b9d7f41..d930178a 100644 --- a/acp/package.json +++ b/acp/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.4.6", + "version": "1.4.7", "description": "", "main": "index.js", "scripts": { diff --git a/client/package.json b/client/package.json index 13676814..bbc55739 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "mnml-client", - "version": "1.4.6", + "version": "1.4.7", "description": "", "main": "index.js", "scripts": { diff --git a/ops/package.json b/ops/package.json index a7f08e96..35c94dd8 100755 --- a/ops/package.json +++ b/ops/package.json @@ -1,6 +1,6 @@ { "name": "mnml-ops", - "version": "1.4.6", + "version": "1.4.7", "description": "", "main": "index.js", "scripts": { diff --git a/server/Cargo.toml b/server/Cargo.toml index 89ecb188..565aef8f 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "mnml" -version = "1.4.6" +version = "1.4.7" authors = ["ntr "] [dependencies] From 2217afaa642e86ec9d65f667e245570f9b5e07f7 Mon Sep 17 00:00:00 2001 From: ntr Date: Thu, 19 Sep 2019 22:33:07 +1000 Subject: [PATCH 2/2] demo state check --- client/src/events.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/events.jsx b/client/src/events.jsx index 05b01677..216af011 100644 --- a/client/src/events.jsx +++ b/client/src/events.jsx @@ -206,6 +206,7 @@ function registerEvents(store) { } function setDemo(d) { + const initial = { players: d, combiner: [], @@ -215,7 +216,8 @@ function registerEvents(store) { }; const startDemo = () => { - console.log(initial); + const { account } = store.getState(); + if (account) return false; store.dispatch(actions.setDemo(initial)); store.dispatch(actions.setAnimTarget(null)); setTimeout(() => store.dispatch(actions.setDemo(Object.assign({}, initial, { combiner: [0] }))), 2000);