Merge branch 'master' into develop

2018-10-21 00:19:34 +02:00 · 2018-10-21 00:19:34 +02:00 · 87abbbcd2e
commit 87abbbcd2e
parent 18cf0ca6c9 ed001ff4fb
6 changed files with 120 additions and 7 deletions
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@ -612,12 +612,12 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
            self.edit_handler()
            return

-        if self.rhs:
+        if '=' in self.args:
            # We have an =
            obj = caller.search(self.lhs)
            if not obj:
                return
-            desc = self.rhs
+            desc = self.rhs or ''
        else:
            obj = caller.location or self.msg("|rYou can't describe oblivion.|n")
            if not obj: