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

Added more error checking to the oob function launch code.

Browse source
This commit is contained in:
Griatch 2011-11-09 00:12:55 +01:00
parent d928d25ac7
commit 329a13bf8a
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/server/serversession.py
View file

@ -232,11 +232,20 @@ class ServerSession(Session):
print "server: " print "server: "
outdata = {} outdata = {}
entity = self.get_character()
if not entity:
entity = self.get_player()
if not entity:
entity = self
for funcname, argtuple in data.items(): for funcname, argtuple in data.items():
# loop through the data, calling available functions. # loop through the data, calling available functions.
func = OOB_FUNC_MODULE.__dict__.get(funcname, None) func = OOB_FUNC_MODULE.__dict__.get(funcname, None)
if func: if func:
outdata[funcname] = func(*argtuple[0], **argtuple[1]) try:
outdata[funcname] = func(entity, *argtuple[0], **argtuple[1])
except Exception:
logger.log_trace()
else: else:
logger.log_errmsg("oob_data_in error: funcname '%s' not found in OOB_FUNC_MODULE." % funcname) logger.log_errmsg("oob_data_in error: funcname '%s' not found in OOB_FUNC_MODULE." % funcname)
if outdata: if outdata: