From f3ca08b5e6a6a7588d0cd87a7fdbc9c71001f049 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Wed, 29 May 2019 16:37:01 +1000
Subject: [PATCH] 1v1 standard format

---
 server/src/instance.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/server/src/instance.rs b/server/src/instance.rs
index 7b2e420f..34675d5d 100644
--- a/server/src/instance.rs
+++ b/server/src/instance.rs
@@ -149,9 +149,9 @@ impl Instance {
         Ok(self)
     }
 
-    fn set_format(mut self, format: Format) -> Result<Instance, Error> {
+    fn set_format(mut self, format: Format) -> Instance {
         self.format = format;
-        Ok(self)
+        self
     }
 
     fn add_bots(mut self) -> Instance {
@@ -643,6 +643,12 @@ pub fn instance_new(params: InstanceLobbyParams, tx: &mut Transaction, account:
             .set_max_players(16)?
             .set_name(params.name)?
             .add_bots(),
+
+        2 => Instance::new()
+            .set_max_players(params.players)?
+            .set_name(params.name)?
+            .set_format(Format::Standard),
+
         _ => Instance::new()
             .set_max_players(params.players)?
             .set_name(params.name)?,
@@ -754,7 +760,7 @@ mod tests {
     fn instance_pve_test() {
         let mut instance = Instance::new()
             .set_max_players(16).expect("unable to set max players")
-            .set_format(Format::RoundRobin).expect("format failure")
+            .set_format(Format::RoundRobin)
             .add_bots();
 
         let player_account = Uuid::new_v4();
@@ -825,7 +831,7 @@ mod tests {
     fn instance_upkeep_test() {
         let mut instance = Instance::new()
             .set_max_players(2).expect("could not create instance")
-            .set_format(Format::Standard).expect("format err");
+            .set_format(Format::Standard);
 
         let player_account = Uuid::new_v4();
         let constructs = instance_mobs(player_account);