From: Christian Heller Date: Tue, 27 Oct 2020 00:37:08 +0000 (+0100) Subject: Fix re-login corpses. X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/static/git-logo.png?a=commitdiff_plain;h=e6e708c2398e9d5130fcc54e36e81c9dc68707ff;p=plomrogue2-experiments Fix re-login corpses. --- diff --git a/new2/plomrogue/commands.py b/new2/plomrogue/commands.py index 352f40d..8175b2e 100644 --- a/new2/plomrogue/commands.py +++ b/new2/plomrogue/commands.py @@ -13,11 +13,16 @@ cmd_ALL.argtypes = 'string' def cmd_LOGIN(game, nick, connection_id): for t in [t for t in game.things if t.type_ == 'player' and t.nickname == nick]: raise GameError('name already in use') - t = game.thing_types['player'](game) + if connection_id in game.sessions: + t_id = game.sessions[connection_id] + t = game.get_thing(t_id, False) + game.io.send('META ' + quote('you rename yourself to: ' + nick), connection_id) + else: + t = game.thing_types['player'](game) + game.things += [t] # TODO refactor into Thing.__init__? + game.sessions[connection_id] = t.id_ + game.io.send('META ' + quote('you are now: ' + nick), connection_id) t.nickname = nick - game.things += [t] # TODO refactor into Thing.__init__? - game.sessions[connection_id] = t.id_ - game.io.send('META ' + quote('you are now: ' + nick), connection_id) game.io.send('PLAYER_ID %s' % t.id_, connection_id) cmd_LOGIN.argtypes = 'string'