From 9fe9020ac92c531d164dcaa7ff2d7c75e0129198 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 29 Nov 2019 16:08:09 +1000
Subject: [PATCH] skip faceoff serverside

---
 WORKLOG.md             | 1 -
 client/src/events.jsx  | 5 -----
 server/src/instance.rs | 3 +++
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index d254b298..7b8101ea 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -3,7 +3,6 @@
 
 _ntr_
 * can't reset password without knowing password =\
-* skip faceoff on server side
 * change cooldowns to delay & recharge
   - delay is cooldown before skill can first be used
   - recharge is cooldown after using skill
diff --git a/client/src/events.jsx b/client/src/events.jsx
index f1b7e158..d6ca701a 100644
--- a/client/src/events.jsx
+++ b/client/src/events.jsx
@@ -220,11 +220,6 @@ function registerEvents(store) {
             const player = v.players.find(p => p.id === account.id);
             store.dispatch(actions.setPlayer(player));
 
-            const skip = v.time_control === 'Practice' && v.phase === 'Lobby';
-            if (skip) {
-                ws.sendInstanceReady(v.id);
-            }
-
             if (v.phase === 'Finished') {
                 ws.sendAccountInstances();
             }
diff --git a/server/src/instance.rs b/server/src/instance.rs
index 65c17b65..912b89c6 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -706,7 +706,10 @@ pub fn instance_practice(tx: &mut Transaction, account: &Account) -> Result<Inst
 
     instance.add_player(player.clone())?;
     instance.add_player(bot)?;
+
     instance.player_ready(bot_id)?;
+    // skip faceoff
+    instance.player_ready(player.id)?;
 
     instance = instance_create(tx, instance)?;
     player_create(tx, player, instance.id, account)?;