Bugfix/unr 1729 check for unloaded class in metadata (#1189)

* Use weak pointer in UnrealMetadata * Add log for stale classes
spatialos · Jul 21, 2019 · fd574a0 · fd574a0
1 parent 2b97896
commit fd574a0
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/SpatialGDK/Source/SpatialGDK/Public/Schema/UnrealMetadata.h b/SpatialGDK/Source/SpatialGDK/Public/Schema/UnrealMetadata.h
@@ -68,11 +68,18 @@ struct UnrealMetadata : Component
 
 	FORCEINLINE UClass* GetNativeEntityClass()
 	{
-		if (NativeClass != nullptr)
+		if (NativeClass.IsValid())
 		{
-			return NativeClass;
+			return NativeClass.Get();
 		}
 
+#if !UE_BUILD_SHIPPING
+		if (NativeClass.IsStale())
+		{
+			UE_LOG(LogSpatialClassInfoManager, Warning, TEXT("UnrealMetadata native class %s unloaded whilst entity in view."), *ClassPath);
+		}
+#endif
+
 		if (UClass* Class = LoadObject<UClass>(nullptr, *ClassPath))
 		{
 			if (Class->IsChildOf<AActor>())
@@ -90,7 +97,7 @@ struct UnrealMetadata : Component
 	FString ClassPath;
 	TSchemaOption<bool> bNetStartup;
 
-	UClass* NativeClass = nullptr;
+	TWeakObjectPtr<UClass> NativeClass;
 };
 
 FORCEINLINE SubobjectToOffsetMap CreateOffsetMapFromActor(AActor* Actor, const FClassInfo& Info)