From f8d9e2fb9bff9e087c8731a876e9c2523ab7f3dd Mon Sep 17 00:00:00 2001 From: phkb Date: Mon, 4 May 2026 12:55:07 +1000 Subject: [PATCH] Fixes issue where running strict mode will wipe all OXP activate/mode key or joystick settings --- src/Core/Entities/PlayerEntity.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Core/Entities/PlayerEntity.m b/src/Core/Entities/PlayerEntity.m index 13772e78a..5f4ccc3c6 100644 --- a/src/Core/Entities/PlayerEntity.m +++ b/src/Core/Entities/PlayerEntity.m @@ -2259,7 +2259,11 @@ - (void) completeSetUpAndSetTarget:(BOOL)setTarget [self setDockedStation:[UNIVERSE station]]; [self setLastAegisLock:[UNIVERSE planet]]; - [self validateCustomEquipActivationArray]; + // only do this if we're not in strict mode, otherwise all previously saved OXP key/joystick defs will be wiped. + if (![[UNIVERSE useAddOns] isEqualToString:SCENARIO_OXP_DEFINITION_NONE]) + { + [self validateCustomEquipActivationArray]; + } JSContext *context = OOJSAcquireContext(); [self doWorldScriptEvent:OOJSID("startUp") inContext:context withArguments:NULL count:0 timeLimit:MAX(0.0, [[NSUserDefaults standardUserDefaults] oo_floatForKey:@"start-script-limit-value" defaultValue:kOOJSLongTimeLimit])];