Fixed invalid entity lookup for physics body.

afritz1 · Jan 12, 2025 · a8f4e99 · a8f4e99
1 parent 9d944a5
commit a8f4e99
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/OpenTESArena/src/Entities/EntityChunkManager.cpp b/OpenTESArena/src/Entities/EntityChunkManager.cpp
@@ -745,10 +745,10 @@ EntityInstanceID EntityChunkManager::getEntityFromPhysicsBodyID(JPH::BodyID body
 	// @todo: probably want a smarter lookup than this
 	for (int i = 0; i < this->entities.getTotalCount(); i++)
 	{
-		const EntityInstance &entityInst = this->entities.get(i);
-		if (entityInst.physicsBodyID == bodyID)
+		const EntityInstance *entityInst = this->entities.tryGet(i);
+		if (entityInst != nullptr && entityInst->physicsBodyID == bodyID)
 		{
-			return entityInst.instanceID;
+			return entityInst->instanceID;
 		}
 	}