From 6a8d53307062061c76001957ef0cfd3061618049 Mon Sep 17 00:00:00 2001
From: JoePfeiffer <joseph@pfeifferfamily.net>
Date: Mon, 7 Mar 2022 09:59:14 -0700
Subject: [PATCH] Cache active motors instead of recalculating on each call

---
 .../rocketcomponent/FlightConfiguration.java    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
index 7cbd9f0bf..70f645ab1 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfiguration.java
@@ -63,6 +63,7 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	/* Cached data */
 	final protected HashMap<Integer, StageFlags> stages = new HashMap<Integer, StageFlags>();
 	final protected HashMap<MotorConfigurationId, MotorConfiguration> motors = new HashMap<MotorConfigurationId, MotorConfiguration>();
+	final private Collection<MotorConfiguration> activeMotors = new ArrayList<MotorConfiguration>();
 	
 	private int boundsModID = -1;
 	private BoundingBox cachedBounds = new BoundingBox();
@@ -499,18 +500,12 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 	}
 	
 	public Collection<MotorConfiguration> getActiveMotors() {
-		Collection<MotorConfiguration> activeMotors = new ArrayList<MotorConfiguration>();
-		for( MotorConfiguration config : this.motors.values() ){
-			if( isComponentActive( config.getMount() )){
-				activeMotors.add( config );
-			}
-		}
 		
 		return activeMotors;
 	}
 
 	private void updateMotors() {
-		this.motors.clear();
+		motors.clear();
 		
 		for ( RocketComponent comp : getActiveComponents() ){
 			if (( comp instanceof MotorMount )&&( ((MotorMount)comp).isMotorMount())){
@@ -520,10 +515,16 @@ public class FlightConfiguration implements FlightConfigurableParameter<FlightCo
 					continue;
 				}
 				
-				this.motors.put( motorConfig.getMID(), motorConfig);
+				motors.put( motorConfig.getMID(), motorConfig);
 			}
 		}
 		
+		activeMotors.clear();
+		for( MotorConfiguration config : motors.values() ){
+			if( isComponentActive( config.getMount() )){
+				activeMotors.add( config );
+			}
+		}
 	}
 
 	@Override