From 13f9bc4afa40c58b32bf33c75c77e74e09cdc9e4 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 20 Jan 2018 23:59:28 +0100
Subject: [PATCH] Correctly call the parent at_sync in the serversession.
 Resolves #1555.

---
 evennia/server/serversession.py | 1 +
 evennia/server/session.py       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/evennia/server/serversession.py b/evennia/server/serversession.py
index 2a427d591f..b7f74cef5d 100644
--- a/evennia/server/serversession.py
+++ b/evennia/server/serversession.py
@@ -188,6 +188,7 @@ class ServerSession(Session):
         if not _ObjectDB:
             from evennia.objects.models import ObjectDB as _ObjectDB
 
+        super(ServerSession, self).at_sync()
         if not self.logged_in:
             # assign the unloggedin-command set.
             self.cmdset_storage = settings.CMDSET_UNLOGGEDIN
diff --git a/evennia/server/session.py b/evennia/server/session.py
index 9853bcd366..86d7a30d76 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -133,7 +133,8 @@ class Session(object):
         on uid etc).
 
         """
-        self.protocol_flags.update(self.account.attributs.get("_saved_protocol_flags"), {})
+        if self.account:
+            self.protocol_flags.update(self.account.attributes.get("_saved_protocol_flags"), {})
 
     # access hooks