Skip to content

Fixes issue where running strict mode will wipe all OXP activate/mode… #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phkb merged 1 commit into from
May 5, 2026
Merged

Fixes issue where running strict mode will wipe all OXP activate/mode… #618

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Core/Entities/PlayerEntity.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])];
Expand Down