hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include non-active booster condition

Browse Source
This commit is contained in:
SiboVG 2022-06-25 01:03:09 +02:00
parent 027ed2eaa6
commit d8a1de2652
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/net/sf/openrocket/rocketcomponent/AxialStage.java
View File

@ -134,8 +134,7 @@ public class AxialStage extends ComponentAssembly implements FlightConfigurableC
* @return if the object is a launch stage * @return if the object is a launch stage
*/ */
public boolean isLaunchStage(FlightConfiguration config) { public boolean isLaunchStage(FlightConfiguration config) {
return ((this instanceof ParallelStage && config.isStageActive(this.stageNumber)) return (getRocket().getBottomCoreStage(config).equals(this));
||( getRocket().getBottomCoreStage(config).equals(this)));
} }
/** /**

4
core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java
View File

@ -111,8 +111,8 @@ public class ParallelStage extends AxialStage implements FlightConfigurableCompo
} }
@Override @Override
public boolean isLaunchStage(){ public boolean isLaunchStage(FlightConfiguration config) {
return true; return config.isStageActive(this.stageNumber);
} }
@Override @Override