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

Fix material not being set when loading recovery device from preset

Browse Source
This commit is contained in:
SiboVG 2024-04-06 02:24:15 +02:00
parent a590bdc299
commit 69c995b829
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/info/openrocket/core/rocketcomponent/RecoveryDevice.java
View File

@ -124,8 +124,8 @@ public abstract class RecoveryDevice extends MassObject implements FlightConfigu
} }
@Override @Override
protected void loadFromPreset(ComponentPreset preset) { protected void loadFromPreset(ComponentPreset preset, Object...params) {
// // Set preset parachute line material // // Set preset parachute line material
// NEED a better way to set preset if field is empty ---- // NEED a better way to set preset if field is empty ----
if (preset.has(ComponentPreset.MATERIAL)) { if (preset.has(ComponentPreset.MATERIAL)) {
String surfaceMaterialEmpty = preset.get(ComponentPreset.MATERIAL).toString(); String surfaceMaterialEmpty = preset.get(ComponentPreset.MATERIAL).toString();
@ -139,10 +139,15 @@ public abstract class RecoveryDevice extends MassObject implements FlightConfigu
} else { } else {
this.material = defaultMaterial; this.material = defaultMaterial;
} }
super.loadFromPreset(preset); super.loadFromPreset(preset, params);
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
} }
@Override
protected void loadFromPreset(ComponentPreset preset) {
loadFromPreset(preset, (Object[]) null);
}
@Override @Override
protected RocketComponent copyWithOriginalID() { protected RocketComponent copyWithOriginalID() {
RecoveryDevice copy = (RecoveryDevice) super.copyWithOriginalID(); RecoveryDevice copy = (RecoveryDevice) super.copyWithOriginalID();