From a69c8d0330868c0f353e3d63a81f48732e37728d Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 28 Oct 2020 19:27:13 +0000 Subject: [PATCH] wip new account etc., adding acctid etc. Signed-off-by: Ian Jackson --- src/global.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/global.rs b/src/global.rs index 1a0494ad..1892f242 100644 --- a/src/global.rs +++ b/src/global.rs @@ -484,7 +484,7 @@ impl InstanceGuard<'_> { // We make a copy so if the save fails, we can put everything back let mut players = self.c.g.gs.players.clone(); - let old_account = players.remove(oldplayer); + let old_nick = players.remove(oldplayer); // New state let mut gs = GameState { @@ -569,11 +569,16 @@ impl InstanceGuard<'_> { #[throws(InternalError)] pub fn invalidate_tokens(&mut self, player: PlayerId) { - let old_tokens = self.tokens_players.get(player).clone(); + let old_tokens = TokenRegistry { + tr: self.tokens_players.tr.clone(), + id: self.tokens_players.id, + }; self.tokens_deregister_for_id(|id:PlayerId| id==player); self.save_access_now().map_err(|e|{ - // oof - self.tokens.players.insert(player, old_tokens); + // oof, the tokens are already out of the global map, but + // not saved, so they might come back. We need to leave + // them here so they can be deleted later. + self.tokens_players = old_tokens; e })?; // ppoint of no return -- 2.30.2