diff --git a/server/src/game.rs b/server/src/game.rs index da903232..c3867855 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -653,7 +653,8 @@ pub fn games_need_upkeep(tx: &mut Transaction) -> Result, Error> { let query = " SELECT data, id FROM games - WHERE finished = false; + WHERE finished = false + FOR UPDATE; "; let result = tx .query(query, &[])?; diff --git a/server/src/instance.rs b/server/src/instance.rs index 5c95f0e7..740efb55 100644 --- a/server/src/instance.rs +++ b/server/src/instance.rs @@ -582,7 +582,8 @@ pub fn instances_need_upkeep(tx: &mut Transaction) -> Result, Erro let query = " SELECT data, id FROM instances - WHERE id != '00000000-0000-0000-0000-000000000000'; + WHERE id != '00000000-0000-0000-0000-000000000000' + FOR UPDATE; "; let result = tx diff --git a/server/src/vbox.rs b/server/src/vbox.rs index 68f7f9f2..bcdde1c1 100644 --- a/server/src/vbox.rs +++ b/server/src/vbox.rs @@ -346,14 +346,14 @@ fn get_combos() -> Vec { let mut combinations = vec![ Combo { units: vec![Var::Buff, Var::Red, Var::Red], var: Var::Empower }, Combo { units: vec![Var::Buff, Var::Green, Var::Green], var: Var::Triage }, - Combo { units: vec![Var::Buff, Var::Blue, Var::Blue], var: Var::Amplify }, + Combo { units: vec![Var::Buff, Var::Blue, Var::Blue], var: Var::Amplify }, Combo { units: vec![Var::Buff, Var::Red, Var::Green], var: Var::Clutch }, - Combo { units: vec![Var::Buff, Var::Green, Var::Blue], var: Var::Hostility }, + Combo { units: vec![Var::Buff, Var::Green, Var::Blue], var: Var::Curse }, Combo { units: vec![Var::Buff, Var::Red, Var::Blue], var: Var::Haste }, Combo { units: vec![Var::Debuff, Var::Red, Var::Red], var: Var::Snare }, Combo { units: vec![Var::Debuff, Var::Green, Var::Green], var: Var::Purge }, - Combo { units: vec![Var::Debuff, Var::Blue, Var::Blue], var: Var::Curse }, + Combo { units: vec![Var::Debuff, Var::Blue, Var::Blue], var: Var::Silence }, Combo { units: vec![Var::Debuff, Var::Red, Var::Green], var: Var::Slow }, Combo { units: vec![Var::Debuff, Var::Green, Var::Blue], var: Var::Siphon }, Combo { units: vec![Var::Debuff, Var::Red, Var::Blue], var: Var::Invert },