Legacy liquid antimatter fix was incomplete. Also try mitigate issues…

… starting a PvP match
serprex · Jan 9, 2021 · 42daee5 · 42daee5
1 parent 500745b
commit 42daee5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/rs/server/src/handlews.rs b/src/rs/server/src/handlews.rs
@@ -1109,6 +1109,7 @@ pub async fn handle_ws(
 										if let Some(foeuser) = wusers.load(&*client, &f).await {
 											let foeuserid = foeuser.lock().await.id;
 											if let Ok(trx) = client.transaction().await {
+												trx.execute("delete from match_request mr1 where user_id = $1 and accepted", &[&userid]).await.ok();
 												if let Ok(pending_request_maybe) = trx
 													.query_opt(
 														"select mr1.game_id, games.data \

diff --git a/src/rs/src/game.rs b/src/rs/src/game.rs
@@ -1358,9 +1358,8 @@ impl Game {
 							if shield != 0 {
 								self.trigger_data(Event::Shield, shield, id, &mut hitdata);
 							}
-							let dmg = self.dmg(target, hitdata.dmg);
-							hitdata.dmg = dmg;
-							if dmg != 0 {
+							self.dmg(target, hitdata.dmg);
+							if hitdata.dmg != 0 {
 								self.trigger_data(Event::Hit, id, target, &mut hitdata);
 							}
 						}