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

move call-lock check to building list of objects to check cmdset

Browse source
This commit is contained in:
Cal 2025-01-27 18:48:09 -07:00
parent 284fb68553
commit 2b028410c3
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
evennia/commands/cmdhandler.py
View file

@ -361,7 +361,12 @@ def get_and_merge_cmdsets(
local_objlist = yield ( local_objlist = yield (
location.contents_get(exclude=obj) + obj.contents_get() + [location] location.contents_get(exclude=obj) + obj.contents_get() + [location]
) )
local_objlist = [o for o in local_objlist if not o._is_deleted] local_objlist = [
o
for o in local_objlist
if not o._is_deleted
and o.access(caller, access_type="call", no_superuser_bypass=True)
]
for lobj in local_objlist: for lobj in local_objlist:
try: try:
# call hook in case we need to do dynamic changing to cmdset # call hook in case we need to do dynamic changing to cmdset
@ -375,12 +380,7 @@ def get_and_merge_cmdsets(
chain.from_iterable( chain.from_iterable(
lobj.cmdset.cmdset_stack lobj.cmdset.cmdset_stack
for lobj in local_objlist for lobj in local_objlist
if ( if lobj.cmdset.current
lobj.cmdset.current
and lobj.access(
caller, access_type="call", no_superuser_bypass=True
)
)
) )
) )
for cset in local_obj_cmdsets: for cset in local_obj_cmdsets: