Merge branch 'master' into develop

2017-11-11 01:02:26 +01:00 · 2017-11-11 01:02:26 +01:00 · 4507c7aa2d
commit 4507c7aa2d
parent d2ddbe9eb5 e3766762ee
11 changed files with 461 additions and 29 deletions
--- a/evennia/commands/default/comms.py
+++ b/evennia/commands/default/comms.py
@ -417,7 +417,7 @@ class CmdCBoot(COMMAND_DEFAULT_CLASS):
            string = "You don't control this channel."
            self.msg(string)
            return
-        if account not in channel.db_subscriptions.all():
+        if not channel.subscriptions.has(account):
            string = "Account %s is not connected to channel %s." % (account.key, channel.key)
            self.msg(string)
            return