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

Changed inputhandler/oochandler to monitorhandler and made inputhandler_funcs into just inputfuncs.py

Browse source
This commit is contained in:
Griatch 2016-02-13 00:40:00 +01:00
parent 67b84c2431
commit 4ab049709d
6 changed files with 33 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

12
evennia/server/sessionhandler.py
View file

@ -68,10 +68,10 @@ _MODEL_MAP = None
# input handlers
_INPUT_HANDLER_FUNCS = {}
for modname in make_iter(settings.INPUT_HANDLER_MODULES):
_INPUT_FUNCS = {}
for modname in make_iter(settings.INPUT_FUNC_MODULES):
print modname
_INPUT_HANDLER_FUNCS.update(callables_from_module(modname))
_INPUT_FUNCS.update(callables_from_module(modname))
def delayed_import():
"""
@ -629,11 +629,11 @@ class ServerSessionHandler(SessionHandler):
if session:
for cmdname, (cmdargs, cmdkwargs) in kwargs.iteritems():
try:
if cmdname in _INPUT_HANDLER_FUNCS:
if cmdname in _INPUT_FUNCS:
print "sessionhandler: data_in", cmdname, cmdargs, cmdkwargs
_INPUT_HANDLER_FUNCS[cmdname](session, *cmdargs, **cmdkwargs)
_INPUT_FUNCS[cmdname](session, *cmdargs, **cmdkwargs)
else:
_INPUT_HANDLER_FUNCS["default"](session, cmdname, *cmdargs, **cmdkwargs)
_INPUT_FUNCS["default"](session, cmdname, *cmdargs, **cmdkwargs)
except Exception:
log_trace()