From 69c995b829d4020066f7a90017664ce5505fd31d Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 6 Apr 2024 02:24:15 +0200 Subject: [PATCH] Fix material not being set when loading recovery device from preset --- .../core/rocketcomponent/RecoveryDevice.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/info/openrocket/core/rocketcomponent/RecoveryDevice.java b/core/src/main/java/info/openrocket/core/rocketcomponent/RecoveryDevice.java index 170ec3f9a..043646fd8 100644 --- a/core/src/main/java/info/openrocket/core/rocketcomponent/RecoveryDevice.java +++ b/core/src/main/java/info/openrocket/core/rocketcomponent/RecoveryDevice.java @@ -124,8 +124,8 @@ public abstract class RecoveryDevice extends MassObject implements FlightConfigu } @Override - protected void loadFromPreset(ComponentPreset preset) { - // // Set preset parachute line material + protected void loadFromPreset(ComponentPreset preset, Object...params) { + // // Set preset parachute line material // NEED a better way to set preset if field is empty ---- if (preset.has(ComponentPreset.MATERIAL)) { String surfaceMaterialEmpty = preset.get(ComponentPreset.MATERIAL).toString(); @@ -139,10 +139,15 @@ public abstract class RecoveryDevice extends MassObject implements FlightConfigu } else { this.material = defaultMaterial; } - super.loadFromPreset(preset); + super.loadFromPreset(preset, params); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); } + @Override + protected void loadFromPreset(ComponentPreset preset) { + loadFromPreset(preset, (Object[]) null); + } + @Override protected RocketComponent copyWithOriginalID() { RecoveryDevice copy = (RecoveryDevice) super.copyWithOriginalID();