Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix inherited component registration with different names but identical slots

Browse source
This commit is contained in:
ChrisLR 2024-02-23 13:52:35 -05:00
parent 47be47c009
commit 8ff8234f46
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
evennia/contrib/base_systems/components/holder.py
View file

@ -283,9 +283,16 @@ class ComponentHolderMixin:
for base_type in base_type_iterator():
base_class_components = getattr(base_type, "_class_components", ())
class_components.update({cmp[0]: cmp[1] for cmp in base_class_components})
for cmp_name, cmp_values in base_class_components:
cmp_class = get_component_class(cmp_name)
cmp_slot = cmp_class.get_component_slot()
class_components[cmp_slot] = (cmp_name, cmp_values)
# TODO Is this necessary?
instance_components = getattr(self, "_class_components", ())
class_components.update({cmp[0]: cmp[1] for cmp in instance_components})
for cmp_name, cmp_values in instance_components:
cmp_class = get_component_class(cmp_name)
cmp_slot = cmp_class.get_component_slot()
class_components[cmp_slot] = (cmp_name, cmp_values)
return tuple(class_components.items())
return tuple(class_components.values())