Fixed invalid entity lookup for physics body.

afritz1 · afritz1 · commit a8f4e99f339b · 2025-01-12T13:03:30.000-08:00
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;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -745,10 +745,10 @@ EntityInstanceID EntityChunkManager::getEntityFromPhysicsBodyID(JPH::BodyID body`
`745`	`745`	`// @todo: probably want a smarter lookup than this`
`746`	`746`	`for (int i = 0; i < this->entities.getTotalCount(); i++)`
`747`	`747`	`{`
`748`		`- const EntityInstance &entityInst = this->entities.get(i);`
`749`		`- if (entityInst.physicsBodyID == bodyID)`
	`748`	`+ const EntityInstance *entityInst = this->entities.tryGet(i);`
	`749`	`+ if (entityInst != nullptr && entityInst->physicsBodyID == bodyID)`
`750`	`750`	`{`
`751`		`- return entityInst.instanceID;`
	`751`	`+ return entityInst->instanceID;`
`752`	`752`	`}`
`753`	`753`	`}`
`754`	`754`