Skip to content

Commit 75de5d9

Browse files
committed
Fix entity prefab slot match prefab wrong comparision
1 parent ab5f1a2 commit 75de5d9

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

src/Scripts/Game/Components/EPF_BaseInventoryStorageComponentSaveData.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class EPF_BaseInventoryStorageComponentSaveData : EPF_ComponentSaveData
130130
// Found matching entity, no need to spawn, just apply save-data
131131
if (slot.m_pEntity &&
132132
slotEntity &&
133-
EPF_Utils.GetPrefabName(slotEntity) == slot.m_pEntity.m_rPrefab)
133+
EPF_Utils.GetPrefabName(slotEntity).StartsWith(slot.m_pEntity.m_rPrefab))
134134
{
135135
EPF_PersistenceComponent slotPersistence = EPF_Component<EPF_PersistenceComponent>.Find(slotEntity);
136136
if (slotPersistence && !slotPersistence.Load(slot.m_pEntity, false))

src/Scripts/Game/Components/EPF_SlotManagerComponentSaveData.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class EPF_SlotManagerComponentSaveData : EPF_ComponentSaveData
141141
// Found matching entity, no need to spawn, just apply save-data
142142
if (saveData &&
143143
slotEntity &&
144-
EPF_Utils.GetPrefabName(slotEntity) == saveData.m_rPrefab)
144+
EPF_Utils.GetPrefabName(slotEntity).StartsWith(saveData.m_rPrefab))
145145
{
146146
EPF_PersistenceComponent slotPersistence = EPF_Component<EPF_PersistenceComponent>.Find(slotEntity);
147147
if (slotPersistence && !slotPersistence.Load(saveData, false))

src/Scripts/Game/Components/EPF_WeaponSlotComponentSaveData.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class EPF_WeaponSlotComponentSaveData : EPF_ComponentSaveData
6565
// Found matching entity, no need to spawn, just apply save-data
6666
if (m_pEntity &&
6767
slotEntity &&
68-
EPF_Utils.GetPrefabName(slotEntity) == m_pEntity.m_rPrefab)
68+
EPF_Utils.GetPrefabName(slotEntity).StartsWith(m_pEntity.m_rPrefab))
6969
{
7070
EPF_PersistenceComponent slotPersistence = EPF_Component<EPF_PersistenceComponent>.Find(slotEntity);
7171
if (slotPersistence && !slotPersistence.Load(m_pEntity, false))

src/Scripts/Game/EPF_EntitySaveData.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class EPF_EntitySaveData : EPF_MetaDataDbEntity
9494
{
9595
typename saveDataType = EPF_Utils.TrimEnd(componentSaveDataClass.ClassName(), 5).ToType();
9696
if (!saveDataType)
97-
return false;
97+
return EPF_EReadResult.ERROR;
9898

9999
array<Managed> outComponents();
100100
entity.FindComponents(EPF_ComponentSaveDataType.Get(componentSaveDataClass.Type()), outComponents);

src/Scripts/Game/EPF_PersistenceComponent.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@
166166
IEntity owner = GetOwner();
167167
EPF_PersistenceComponentClass settings = EPF_PersistenceComponentClass.Cast(GetComponentData(owner));
168168
EPF_EntitySaveData saveData = EPF_EntitySaveData.Cast(settings.m_tSaveDataType.Spawn());
169+
169170
if (saveData)
170171
readResult = saveData.ReadFrom(owner, settings.m_pSaveData);
171172

0 commit comments

Comments
 (0)