From 0614aa6526350e8f6451b19cfc22e845ad0fd56f Mon Sep 17 00:00:00 2001
From: mrhid6 <dominic.richardson1@hotmail.co.uk>
Date: Sat, 4 Jul 2026 21:24:59 +0100
Subject: [PATCH] fix: Fixed CTD with data assets

---
 .../Private/Subsystems/RRDADataAssetSubsystem.cpp    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Source/RefinedRDApi/Private/Subsystems/RRDADataAssetSubsystem.cpp b/Source/RefinedRDApi/Private/Subsystems/RRDADataAssetSubsystem.cpp
index 1d1383a..f3bc2b9 100644
--- a/Source/RefinedRDApi/Private/Subsystems/RRDADataAssetSubsystem.cpp
+++ b/Source/RefinedRDApi/Private/Subsystems/RRDADataAssetSubsystem.cpp
@@ -408,7 +408,8 @@ TArray<URRDATurbineDataAsset*> URRDADataAssetSubsystem::GetAllTurbineAssets(int3
 }
 
 URRDATurbineDataAsset* URRDADataAssetSubsystem::GetDefaultTurbineAsset(int32 Tier) const {
-	return GetAllTurbineAssets(Tier).Top();
+	TArray<URRDATurbineDataAsset*> Assets = GetAllTurbineAssets(Tier);
+	return Assets.Num() > 0 ? Assets.Top() : nullptr;
 }
 
 URRDATurbineDataAsset* URRDADataAssetSubsystem::GetTurbineItemData(TSubclassOf<UFGItemDescriptor> Item, int32 Tier) const {
@@ -435,7 +436,8 @@ URRDACoolerDataAsset* URRDADataAssetSubsystem::GetCoolerItemData(TSubclassOf<UFG
 }
 
 URRDACoolerDataAsset* URRDADataAssetSubsystem::GetDefaultCoolerAsset(ERRDACoolerType Type) const {
-	return GetAllCoolerAssets(Type).Top();
+	TArray<URRDACoolerDataAsset*> Assets = GetAllCoolerAssets(Type);
+	return Assets.Num() > 0 ? Assets.Top() : nullptr;
 }
 
 TArray<URRDACoolerDataAsset*> URRDADataAssetSubsystem::GetAllCoolerAssets(ERRDACoolerType Type) const {
@@ -481,7 +483,8 @@ bool URRDADataAssetSubsystem::GetAllBoilerRelevantItems(TArray<TSubclassOf<UFGIt
 }
 
 URRDABoilerDataAsset* URRDADataAssetSubsystem::GetDefaultBoilerAsset(int32 Tier) const {
-	return GetAllBoilerAssets(Tier).Top();
+	TArray<URRDABoilerDataAsset*> Assets = GetAllBoilerAssets(Tier);
+	return Assets.Num() > 0 ? Assets.Top() : nullptr;
 }
 
 TArray<URRDABoilerDataAsset*> URRDADataAssetSubsystem::GetAllBoilerAssets(int32 Tier) const {
@@ -522,7 +525,8 @@ bool URRDADataAssetSubsystem::GetAllHeaterRelevantItems(TArray<TSubclassOf<UFGIt
 }
 
 URRDAHeaterDataAsset* URRDADataAssetSubsystem::GetDefaultHeaterAsset(ERRDAHeaterType Type) const {
-	return GetAllHeaterAssets(Type).Top();
+	TArray<URRDAHeaterDataAsset*> Assets = GetAllHeaterAssets(Type);
+	return Assets.Num() > 0 ? Assets.Top() : nullptr;
 }
 
 TArray<URRDAHeaterDataAsset*> URRDADataAssetSubsystem::GetAllHeaterAssets(ERRDAHeaterType Type) const {