fix: improved safety to prevent crashing caused by raycast

SaneEngineer · Jun 13, 2024 · 6a9712e · 6a9712e
1 parent 4eb30f7
commit 6a9712e
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/RaycastHelper.cpp b/src/RaycastHelper.cpp
@@ -95,7 +95,8 @@ Raycast::RayResult Raycast::hkpCastRay(const glm::vec4& start, const glm::vec4&
 	pickData.rayHitCollectorA8 = reinterpret_cast<RE::hkpClosestRayHitCollector*>(collector);
 
 	const auto ply = RE::PlayerCharacter::GetSingleton();
-	if (!ply->parentCell)
+	auto cell = ply->GetParentCell();
+	if (!cell)
 		return {};
 
 	if (ply->loadedData && ply->loadedData->data3D)
@@ -121,12 +122,15 @@ Raycast::RayResult Raycast::hkpCastRay(const glm::vec4& start, const glm::vec4&
 
 	RayResult result;
 
-	auto physicsWorld = ply->parentCell->GetbhkWorld();
-	if (physicsWorld) {
-		//physicsWorld->PickObject(pickData);
-		if (physicsWorld->PickObject(pickData); pickData.rayOutput.HasHit()) {
-			result.CollisionLayer = static_cast<RE::COL_LAYER>(pickData.rayOutput.rootCollidable->broadPhaseHandle.collisionFilterInfo & 0x7F);
+	try {
+		auto physicsWorld = cell->GetbhkWorld();
+		if (physicsWorld) {
+			//physicsWorld->PickObject(pickData);
+			if (physicsWorld->PickObject(pickData); pickData.rayOutput.HasHit()) {
+				result.CollisionLayer = static_cast<RE::COL_LAYER>(pickData.rayOutput.rootCollidable->broadPhaseHandle.collisionFilterInfo & 0x7F);
+			}
 		}
+	} catch (...) {
 	}
 
 	result.hitArray = collector->GetHits();