From 8dacfea0cb092a4be702bc9427ed8a2be1793dea Mon Sep 17 00:00:00 2001
From: nicfreeman1209 <nicfreeman1209@gmail.com>
Date: Wed, 5 May 2021 11:54:48 +0100
Subject: [PATCH] move block/night logic from socket to menu

---
 src/App.vue             | 2 +-
 src/components/Menu.vue | 7 ++++++-
 src/store/socket.js     | 3 ---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index bb5bc65..1956431 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -116,7 +116,7 @@ export default {
           break;
         case "s":
           if (this.session.isSpectator) return;
-          this.$store.commit("toggleNight");
+          this.$refs.menu.toggleNight();
           break;
         case "escape":
           this.$store.commit("toggleModal");
diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index 40abc72..bc951c4 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -327,12 +327,17 @@ export default {
         this.$store.dispatch("players/clearRoles");
       }
     },
+    toggleNight() {
+      this.$store.commit("toggleNight");
+      if (this.grimoire.isNight) {
+        this.$store.commit("players/setOnBlock", -1);
+      }
+    },
     ...mapMutations([
       "toggleGrimoire",
       "toggleMenu",
       "toggleImageOptIn",
       "toggleMuted",
-      "toggleNight",
       "toggleNightOrder",
       "setZoom",
       "toggleModal"
diff --git a/src/store/socket.js b/src/store/socket.js
index c2d1af3..3dc4239 100644
--- a/src/store/socket.js
+++ b/src/store/socket.js
@@ -691,9 +691,6 @@ class LiveSession {
   setIsNight() {
     if (this._isSpectator) return;
     this._send("isNight", this._store.state.grimoire.isNight);
-    if (this._store.state.grimoire.isNight) {
-      this._store.commit("players/setOnBlock", -1);
-    }
   }
 
   /**