better tnnis

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