From 335c2dd2110479221e5e9d2a5f44e0fcf8b249b8 Mon Sep 17 00:00:00 2001
From: nicfreeman1209 <nicfreeman1209@gmail.com>
Date: Wed, 5 May 2021 08:20:38 +0100
Subject: [PATCH] remove direct ST control of block

---
 src/components/Player.vue | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/components/Player.vue b/src/components/Player.vue
index cae71ca..7cf8cac 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -132,11 +132,10 @@
             <li @click="changeName">
               <font-awesome-icon icon="user-edit" />Rename
             </li>
-            <li v-if="!session.nomination" @click="removePlayer">
+            <li @click="removePlayer">
               <font-awesome-icon icon="times-circle" />
               Remove
             </li>
-            <template v-if="!session.nomination">
               <li @click="movePlayer()">
                 <font-awesome-icon icon="redo-alt" />
                 Move player
@@ -145,10 +144,7 @@
                 <font-awesome-icon icon="exchange-alt" />
                 Swap seats
               </li>
-              <li @click="toggleOnBlock()">
-                <font-awesome-icon icon="skull" />
-                {{ player.isOnBlock ? "Take off block" : "Put on block" }}
-              </li>
+            <template v-if="!session.nomination">
               <li @click="nominatePlayer()">
                 <font-awesome-icon icon="hand-point-right" />
                 Nomination
@@ -272,7 +268,7 @@ export default {
         if (!this.player.isDead) {
           this.updatePlayer("isDead", true);
           if (this.player.isOnBlock) {
-            this.toggleOnBlock();
+            this.updatePlayer("isOnBlock", false);
           }
         } else if (this.player.isVoteless) {
           this.updatePlayer("isVoteless", false);
@@ -283,7 +279,7 @@ export default {
       } else {
         this.updatePlayer("isDead", !this.player.isDead);
         if (this.player.isOnBlock) {
-          this.toggleOnBlock();
+          this.updatePlayer("isOnBlock", false);
         }
         if (this.player.isVoteless) {
           this.updatePlayer("isVoteless", false);
@@ -339,10 +335,6 @@ export default {
       this.isMenuOpen = false;
       this.$emit("trigger", ["claimSeat"]);
     },
-    toggleOnBlock() {
-      this.isMenuOpen = false;
-      this.$emit("trigger", ["toggleOnBlock"]);
-    },
     /**
      * Allow the ST to override a locked vote.
      */