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

Further doc cleanup

Browse source
This commit is contained in:
Griatch 2022-01-19 23:01:54 +01:00
parent f1b970d45a
commit d00ed3f82a
6 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/prototypes/spawner.py
View file

@ -241,15 +241,15 @@ def _get_prototype(inprot, protparents, uninherited=None, _workprot=None):
# attrs, tags have internal structure that should be inherited separately
new_prot["attrs"] = _inherit_attrs(
_workprot.get("attrs", {}), new_prot.get("attrs", {})
_workprot.get("attrs", {}), new_prot.get("attrs", [])
)
new_prot["tags"] = _inherit_tags(_workprot.get("tags", {}), new_prot.get("tags", {}))
new_prot["tags"] = _inherit_tags(_workprot.get("tags", []), new_prot.get("tags", []))
_workprot.update(new_prot)
# the inprot represents a higher level (a child prot), which should override parents
inprot["attrs"] = _inherit_attrs(_workprot.get("attrs", {}), inprot.get("attrs", {}))
inprot["tags"] = _inherit_tags(_workprot.get("tags", {}), inprot.get("tags", {}))
inprot["attrs"] = _inherit_attrs(_workprot.get("attrs", []), inprot.get("attrs", []))
inprot["tags"] = _inherit_tags(_workprot.get("tags", []), inprot.get("tags", []))
_workprot.update(inprot)
if uninherited:
# put back the parts that should not be inherited