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/commands/cmdsethandler.py
View file

@ -183,7 +183,7 @@ def import_cmdset(path, cmdsetobj, emit_to_obj=None, no_logging=False):
# returning an empty error cmdset
errstring = errstring.strip()
if not no_logging:
logger.log_errmsg(errstring)
logger.log_err(errstring)
if emit_to_obj and not ServerConfig.objects.conf("server_starting_mode"):
emit_to_obj.msg(errstring)
err_cmdset = _ErrorCmdSet()