mirror of
https://github.com/evennia/evennia.git
synced 2026-03-26 17:56:32 +01:00
Made cmdhandler respect an explicit True/False setting.
This commit is contained in:
parent
3f1a887841
commit
5863ef29a8
2 changed files with 7 additions and 3 deletions
|
|
@ -188,9 +188,11 @@ def get_and_merge_cmdsets(caller, session, player, obj,
|
|||
lobj.locks.check(caller, 'call', no_superuser_bypass=True))]
|
||||
for cset in local_obj_cmdsets:
|
||||
#This is necessary for object sets, or we won't be able to
|
||||
# separate the command sets from each other in a busy room.
|
||||
# separate the command sets from each other in a busy room. We
|
||||
# only keep the setting if duplicates were set to False/True
|
||||
# explicitly.
|
||||
cset.old_duplicates = cset.duplicates
|
||||
cset.duplicates = True
|
||||
cset.duplicates = True if cset.duplicates is None else cset.duplicates
|
||||
returnValue(local_obj_cmdsets)
|
||||
except Exception:
|
||||
logger.log_trace()
|
||||
|
|
|
|||
|
|
@ -128,7 +128,9 @@ class CmdSet(object):
|
|||
key = "Unnamed CmdSet"
|
||||
mergetype = "Union"
|
||||
priority = 0
|
||||
duplicates = False
|
||||
# if None, the cmdhandler will switch to True for objects and stay False otherwise.
|
||||
# Explicitly set True/False will be kept.
|
||||
duplicates = None
|
||||
key_mergetypes = {}
|
||||
no_exits = False
|
||||
no_objs = False
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue