Merge branch 'command_obj_attribute_error_fix' of https://github.com/TehomCD/evennia into TehomCD-command_obj_attribute_error_fix

This commit is contained in:
Griatch 2017-06-04 00:43:33 +02:00
commit 94376257a4

View file

@ -429,7 +429,7 @@ class Command(with_metaclass(CommandMeta, object)):
object, conventionally with a preceding space.
"""
if hasattr(self, 'obj') and self.obj != caller:
if hasattr(self, 'obj') and self.obj and self.obj != caller:
return " (%s)" % self.obj.get_display_name(caller).strip()
return ""