Skip to content

Commit 17551ba

Browse files
committed
TypeTreeHelper Py - fix config copy and skip ref type if cls is empty
1 parent 35bb1fd commit 17551ba

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

‎UnityPy/helpers/TypeTreeHelper.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from __future__ import annotations
22

33
import re
4-
from copy import copy
54
from typing import TYPE_CHECKING, Any, Optional, Union
65

76
from attrs import define
@@ -79,6 +78,9 @@ class TypeTreeConfig:
7978
assetsfile: "Optional[SerializedFile]" = None
8079
has_registry: bool = False
8180

81+
def copy(self) -> TypeTreeConfig:
82+
return TypeTreeConfig(self.as_dict, self.assetsfile, self.has_registry)
83+
8284

8385
def get_ref_type_node(ref_object: dict, assetfile: SerializedFile) -> TypeTreeNode:
8486
typ = ref_object["type"]
@@ -94,6 +96,9 @@ def get_ref_type_node(ref_object: dict, assetfile: SerializedFile) -> TypeTreeNo
9496
if not assetfile or not assetfile.ref_types:
9597
raise ValueError("SerializedFile has no ref_types")
9698

99+
if cls == "":
100+
return None
101+
97102
for ref_type in assetfile.ref_types:
98103
if (
99104
cls == ref_type.m_ClassName
@@ -186,6 +191,8 @@ def read_value(
186191
for child in node.m_Children:
187192
if child.m_Type == "ReferencedObjectData":
188193
ref_type_nodes = get_ref_type_node(value, config.assetsfile)
194+
if ref_type_nodes is None:
195+
continue
189196
value[child.m_Name] = read_value(ref_type_nodes, reader, config)
190197
else:
191198
value[child.m_Name] = read_value(child, reader, config)
@@ -209,7 +216,7 @@ def read_value(
209216
if config.has_registry:
210217
continue
211218
else:
212-
config = copy(config)
219+
config = config.copy()
213220
config.has_registry = True
214221
value[child.m_Name] = read_value(child, reader, config)
215222

@@ -438,7 +445,7 @@ def write_value(
438445
if config.has_registry:
439446
continue
440447
else:
441-
config = copy(config)
448+
config = config.copy()
442449
config.has_registry = True
443450
write_value(value[child.m_Name], child, writer, config)
444451
else:
@@ -447,7 +454,7 @@ def write_value(
447454
if config.has_registry:
448455
continue
449456
else:
450-
config = copy(config)
457+
config = config.copy()
451458
config.has_registry = True
452459
write_value(
453460
getattr(value, clean_name(child.m_Name)), child, writer, config

0 commit comments

Comments
 (0)