From 23d05abd3d63f5345338635331b804568f6338db Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 3 Sep 2020 21:26:35 +0100 Subject: [PATCH] before refactor report --- src/api.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/api.rs b/src/api.rs index 1ae3f709..485a6c4a 100644 --- a/src/api.rs +++ b/src/api.rs @@ -122,6 +122,7 @@ impl ApiPieceOpError { match self { ReportViaUpdate(poe) => { + ig.gs.gen.increment(); let gen = ig.gs.gen; let pc = ig.gs.pieces.byid_mut(piece).map_err(|()| OE::PieceGone)?; let pri = lens.svg_pri(piece,pc,player); @@ -247,10 +248,11 @@ impl ApiPieceOp for ApiPieceMove { _lens: &dyn Lens) -> (PieceUpdateOp<()>, Vec) { let pc = gs.pieces.byid_mut(piece).unwrap(); - if let (_,true) = self.0.clamped(gs.table_size) { + let (pos, clamped) = self.0.clamped(gs.table_size); + pc.pos = self.0; + if clamped { Err(ApiPieceOpError::ReportViaUpdate(PieceOpError::PosOffTable))?; } - pc.pos = self.0; let update = PieceUpdateOp::Move(self.0); (update, vec![]) } -- 2.30.2