Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2019-05-01 19:20:19 +02:00
commit 43bf2da79c
5 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
evennia/server/amp_client.py
View file

@ -241,4 +241,5 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
else:
raise Exception("operation %(op)s not recognized." % {'op': operation})
return {}

2
evennia/server/session.py
View file

@ -135,7 +135,7 @@ class Session(object):
"""
if self.account:
self.protocol_flags.update(self.account.attributes.get("_saved_protocol_flags", {}))
self.protocol_flags.update(self.account.attributes.get("_saved_protocol_flags", None) or {})
# access hooks