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

Merge pull request #2272 from SiboVG/issue-2270

Browse Source 
[#2270] Only check axial stages for upper stage, not boosters
This commit is contained in:
Sibo Van Gool 2023-07-27 16:56:18 +02:00 committed by GitHub
commit ced2fb086e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,14 +170,14 @@ public class AxialStage extends ComponentAssembly implements FlightConfigurableC
* @return the previous stage in the rocket
*/
public AxialStage getUpperStage() {
if( null == this.parent ) {
if (this.parent == null) {
return null;
}else if(Rocket.class.isAssignableFrom(this.parent.getClass()) ){
final int thisIndex = getStageNumber();
if( 0 < thisIndex ){
return (AxialStage)parent.getChild(thisIndex-1);
} else if (Rocket.class.isAssignableFrom(this.parent.getClass())) {
final int thisIndex = parent.getChildPosition(this);
if (thisIndex > 0) {
return (AxialStage) parent.getChild(thisIndex-1);
}
}else {
} else {
return this.parent.getStage();
}
return null;