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

Merged conflicts.

Browse source
This commit is contained in:
Griatch 2015-10-19 23:32:00 +02:00
parent 48f1d0b26f
commit 50371b6abd
23 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/scripts/scripthandler.py
View file

@ -74,7 +74,7 @@ class ScriptHandler(object):
script = create.create_script(scriptclass, key=key, obj=self.obj,
autostart=autostart)
if not script:
logger.log_errmsg("Script %s could not be created and/or started." % scriptclass)
logger.log_err("Script %s could not be created and/or started." % scriptclass)
return False
return True

2
evennia/scripts/scripts.py
View file

@ -207,7 +207,7 @@ class DefaultScript(ScriptBase):
self.db_obj.msg(estring)
except Exception:
pass
logger.log_errmsg(estring)
logger.log_err(estring)
def _step_callback(self):
"""