fix null entryType (#22)

acdamiani · Jan 30, 2024 · 3bc87e4 · ijisthee · Feb 4, 2024 · 3bc87e4
1 parent 69687b5
commit 3bc87e4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/Editor/PropertyDrawers/BlackboardEntrySelectorDrawer.cs b/Editor/PropertyDrawers/BlackboardEntrySelectorDrawer.cs
@@ -330,15 +330,15 @@ private static GenericMenu GenerateMenu(SerializedProperty property, FieldInfo f
         private static void GenericMenuSelectOption(SerializedProperty property, BlackboardEntry entry,
             Type entryType = null, string path = "")
         {
-            EntryType.TryGetMappedType(entry.type, out Type mappedEntryType);
+            EntryType.TryGetMappedType(entryType ?? entry.type, out Type mappedEntryType);
 
             SerializedProperty entryProp = property.FindPropertyRelative("m_entry");
             SerializedProperty typeString = property.FindPropertyRelative("m_valueTypeString");
             SerializedProperty valuePathProperty = property.FindPropertyRelative("m_valuePath");
             SerializedProperty isDynamicProperty = property.FindPropertyRelative("m_isDynamic");
 
             entryProp.objectReferenceValue = entry;
-            typeString.stringValue = entryType?.AssemblyQualifiedName ?? mappedEntryType.AssemblyQualifiedName;
+            typeString.stringValue = mappedEntryType.AssemblyQualifiedName;
             valuePathProperty.stringValue = path;
             isDynamicProperty.boolValue = false;
 

diff --git a/Runtime/Blackboard/BlackboardEntrySelector.cs b/Runtime/Blackboard/BlackboardEntrySelector.cs
@@ -152,7 +152,7 @@ public Type entryType
                 if (!entry)
                     return null;
 
-                if (m_valueTypeString == _lastValueTypeString)
+                if (m_valueTypeString == _lastValueTypeString && _lastValueType != null)
                     return _lastValueType;
 
                 _lastValueTypeString = m_valueTypeString;

diff --git a/Runtime/Blackboard/EntryType.cs b/Runtime/Blackboard/EntryType.cs
@@ -45,7 +45,7 @@ public static bool TryGetMappedType(Type entryType, out Type mapped)
         {
             if (!typeof(EntryType).IsAssignableFrom(entryType))
             {
-                mapped = null;
+                mapped = entryType;
                 return false;
             }
 

diff --git a/Runtime/Nodes/Physics/OverlapSphere.cs b/Runtime/Nodes/Physics/OverlapSphere.cs
@@ -33,6 +33,8 @@ public override NodeStatus Tick(object nodeMemory, SchemaAgent agent)
             Collider[] colliders =
                 Physics.OverlapSphere(position.value, radius.value, layerMask, queryTriggerInteraction);
 
+            Debug.Log(hit.entryType);
+
             if (colliders.Length == 0)
                 return NodeStatus.Failure;