From 73456a3d8c450ab1ae71c35d1927f26126af158c Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 21:09:22 +0000 Subject: [PATCH] Fixes serialization/deserialization issue with puppet context. --- evennia/web/utils/general_context.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/evennia/web/utils/general_context.py b/evennia/web/utils/general_context.py index 117036e77..8fd52eec2 100644 --- a/evennia/web/utils/general_context.py +++ b/evennia/web/utils/general_context.py @@ -71,7 +71,9 @@ def general_context(request): if request.user.is_authenticated(): account = request.user puppet = None - if request.session.get('puppet'): puppet = request.session['puppet'] + if account and request.session.get('puppet'): + pk = int(request.session.get('puppet')) + puppet = next((x for x in account.characters if x.pk == pk), None) return { 'account': account,