From 95a927b3b75050b7f97d9e245aabe2ac95d83e46 Mon Sep 17 00:00:00 2001
From: Daniel_M_Williams <equipoise@gmail.com>
Date: Mon, 19 Jun 2017 05:23:32 -0500
Subject: [PATCH] [fix] simulations now correctly count motors on boosters and
 pods

- thrust now counts motors on InnerTubes AND BodyTubes.
---
 core/src/net/sf/openrocket/simulation/MotorClusterState.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/net/sf/openrocket/simulation/MotorClusterState.java b/core/src/net/sf/openrocket/simulation/MotorClusterState.java
index 7a7defbe4..39a97d746 100644
--- a/core/src/net/sf/openrocket/simulation/MotorClusterState.java
+++ b/core/src/net/sf/openrocket/simulation/MotorClusterState.java
@@ -129,7 +129,9 @@ public class MotorClusterState {
 		if( this.currentState.isThrusting() ) {
 			double motorStartTime = this.getMotorTime( startSimulationTime);
 			double motorEndTime = this.getMotorTime( endSimulationTime);
-			return this.motorCount * motor.getAverageThrust( motorStartTime, motorEndTime );
+			
+			int instanceCount = this.config.getMount().getLocations().length;
+			return instanceCount * motor.getAverageThrust( motorStartTime, motorEndTime );
 		}else{
 			return 0.00;
 		}