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

Got the initial connect screen to display in webclient again.

Browse source
This commit is contained in:
Griatch 2016-02-12 12:25:30 +01:00
parent 66641b54ab
commit d48691e121
5 changed files with 52 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

22
evennia/server/portal/portalsessionhandler.py
View file

@ -369,13 +369,21 @@ class PortalSessionHandler(SessionHandler):
# distribute outgoing data to the correct session methods.
if session:
print ("portalsessionhandler.data_out:", session, kwargs)
for cmdname, (cmdargs, cmdkwargs) in kwargs.iteritems():
try:
getattr(session, "send_%s" % cmdname)(*cmdargs, **cmdkwargs)
except AttributeError:
session.send_default(cmdname, *cmdargs, **cmdkwargs)
except Exception:
log_trace()
funcname = "send_%s" % cmdname
if hasattr(session, funcname):
# better to use hassattr here over try..except
# - avoids hiding AttributeErrors in the call.
try:
getattr(session, funcname)(*cmdargs, **cmdkwargs)
except Exception:
log_trace()
else:
try:
# note that send_default always takes cmdname
# as arg too.
session.send_default(cmdname, *cmdargs, **cmdkwargs)
except Exception:
log_trace()
PORTAL_SESSIONS = PortalSessionHandler()