From 7cd2a642f03eaba86af00805ed47b8f99be8fb02 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Mon, 10 Jun 2019 19:58:08 +1000
Subject: [PATCH] better tnnis

---
 .../src/components/instance.create.form.jsx   |  2 +-
 server/src/instance.rs                        | 20 ++++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/client/src/components/instance.create.form.jsx b/client/src/components/instance.create.form.jsx
index 6cb9c377..5efee252 100644
--- a/client/src/components/instance.create.form.jsx
+++ b/client/src/components/instance.create.form.jsx
@@ -67,7 +67,7 @@ class InstanceCreateForm extends Component {
                             placeholder="game name"
                             onInput={this.nameInput}
                         />
-                        <label htmlFor="pveSelect">Practice Mode - Bo10, vs CPU, no time control</label>
+                        <label htmlFor="pveSelect">Practice Mode - vs CPU, no time control</label>
                         <input id="pveSelect"
                             type="checkbox"
                             disabled={disabled}
diff --git a/server/src/instance.rs b/server/src/instance.rs
index 7b602754..debf9a08 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -355,23 +355,19 @@ impl Instance {
             return false;
         }
 
-        for player in self.players.iter() {
-            let score_to_beat = self.players.iter()
-                .filter(|p| p.id != player.id)
-                .max_by_key(|p| p.wins)
-                .unwrap().wins;
-
-            if player.wins >= 4 && player.wins >= score_to_beat + 2 {
-                self.winner = Some(player.id);
-                return true;
-            }
-        }
-
         // both players afk
         if self.players.iter().all(|p| p.wins == 0) {
             return true;
         }
 
+        // tennis
+        for player in self.players.iter() {
+            if player.wins >= 4 && player.wins >= player.losses + 2 {
+                self.winner = Some(player.id);
+                return true;
+            }
+        }
+
         return false;
 
         // boN