From 96c6ad4aff1522e01ba59f8220842d1ba25efa6f Mon Sep 17 00:00:00 2001 From: Griatch Date: Fri, 27 Sep 2013 21:31:47 +0200 Subject: [PATCH] Fixed an issue with channel-sending crashing when ooc. Resolves Issue 429. --- src/commands/cmdhandler.py | 4 ++-- src/commands/default/admin.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/commands/cmdhandler.py b/src/commands/cmdhandler.py index adf2e9a960..6745e6e097 100644 --- a/src/commands/cmdhandler.py +++ b/src/commands/cmdhandler.py @@ -332,7 +332,7 @@ def cmdhandler(called_on, raw_string, testing=False, callertype="session", sessi if syscmd: # replace system command with custom version cmd = syscmd - cmd.sessid = caller.sessid if callertype=="session" else None + cmd.sessid = session.sessid if session else None sysarg = "%s:%s" % (cmdname, args) raise ExecSystemCommand(cmd, sysarg) @@ -398,7 +398,7 @@ def cmdhandler(called_on, raw_string, testing=False, callertype="session", sessi syscmd.cmdstring = syscmd.key syscmd.args = sysarg 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 if hasattr(syscmd, 'obj') and hasattr(syscmd.obj, 'scripts'): diff --git a/src/commands/default/admin.py b/src/commands/default/admin.py index 5598776d48..51d4afbdbc 100644 --- a/src/commands/default/admin.py +++ b/src/commands/default/admin.py @@ -527,7 +527,7 @@ class CmdPerm(MuxCommand): tstring = "" if 'del' in switches: # 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) tstring += "\n%s revokes the permission(s) %s from you." % (caller.name, ", ".join(self.rhslist)) else: