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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2021-06-03 23:25:31 +02:00
commit e6fef4fb69
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/commands/default/building.py
View file

@ -2517,7 +2517,8 @@ class CmdExamine(ObjManipCommand):
locks_string = " Default" locks_string = " Default"
output["Locks"] = locks_string output["Locks"] = locks_string
# cmdsets # cmdsets
if not (len(obj.cmdset.all()) == 1 and obj.cmdset.current.key == "_EMPTY_CMDSET"): if current_cmdset and not (
len(obj.cmdset.all()) == 1 and obj.cmdset.current.key == "_EMPTY_CMDSET"):
# all() returns a 'stack', so make a copy to sort. # all() returns a 'stack', so make a copy to sort.
def _format_options(cmdset): def _format_options(cmdset):
@ -2736,6 +2737,9 @@ class CmdExamine(ObjManipCommand):
account = obj.account account = obj.account
objct = obj objct = obj
# this is usually handled when a command runs, but when we examine
# we may have leftover inherited cmdsets directly after a move etc.
obj.cmdset.update()
# using callback to print results whenever function returns. # using callback to print results whenever function returns.
get_and_merge_cmdsets( get_and_merge_cmdsets(
obj, session, account, objct, mergemode, self.raw_string obj, session, account, objct, mergemode, self.raw_string