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

Fixed an issue with channel-sending crashing when ooc. Resolves Issue 429.

Browse source
This commit is contained in:
Griatch 2013-09-27 21:31:47 +02:00
parent 39b69dcdc2
commit 96c6ad4aff
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/commands/cmdhandler.py
View file

@ -332,7 +332,7 @@ def cmdhandler(called_on, raw_string, testing=False, callertype="session", sessi
if syscmd: if syscmd:
# replace system command with custom version # replace system command with custom version
cmd = syscmd cmd = syscmd
cmd.sessid = caller.sessid if callertype=="session" else None cmd.sessid = session.sessid if session else None
sysarg = "%s:%s" % (cmdname, args) sysarg = "%s:%s" % (cmdname, args)
raise ExecSystemCommand(cmd, sysarg) raise ExecSystemCommand(cmd, sysarg)
@ -398,7 +398,7 @@ def cmdhandler(called_on, raw_string, testing=False, callertype="session", sessi
syscmd.cmdstring = syscmd.key syscmd.cmdstring = syscmd.key
syscmd.args = sysarg syscmd.args = sysarg
syscmd.cmdset = cmdset syscmd.cmdset = cmdset
syscmd.sessid = caller.sessid if callertype=="session" else None syscmd.sessid = session.sessid if session else None
syscmd.raw_string = unformatted_raw_string syscmd.raw_string = unformatted_raw_string
if hasattr(syscmd, 'obj') and hasattr(syscmd.obj, 'scripts'): if hasattr(syscmd, 'obj') and hasattr(syscmd.obj, 'scripts'):

2
src/commands/default/admin.py
View file

@ -527,7 +527,7 @@ class CmdPerm(MuxCommand):
tstring = "" tstring = ""
if 'del' in switches: if 'del' in switches:
# delete the given permission(s) from object. # delete the given permission(s) from object.
obj.permission.remove(self.rhslist) obj.permissions.remove(self.rhslist)
cstring += "\nPermission(s) %s removed from %s (if they existed)." % (", ".join(self.rhslist), obj.name) cstring += "\nPermission(s) %s removed from %s (if they existed)." % (", ".join(self.rhslist), obj.name)
tstring += "\n%s revokes the permission(s) %s from you." % (caller.name, ", ".join(self.rhslist)) tstring += "\n%s revokes the permission(s) %s from you." % (caller.name, ", ".join(self.rhslist))
else: else: