mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-11-10 01:33:54 +01:00
Merge pull request #4072 from Snarling/exitExits
NETSCRIPT: FIX #2376 ns.exit now exits immediately
This commit is contained in:
commit
ed14f2a4d7
@ -79,6 +79,7 @@ import { CalculateShareMult, StartSharing } from "./NetworkShare/Share";
|
||||
import { recentScripts } from "./Netscript/RecentScripts";
|
||||
import { InternalAPI, NetscriptContext, wrapAPI } from "./Netscript/APIWrapper";
|
||||
import { INetscriptExtra } from "./NetscriptFunctions/Extra";
|
||||
import { ScriptDeath } from "./Netscript/ScriptDeath";
|
||||
|
||||
export type NSFull = NS & INetscriptExtra;
|
||||
|
||||
@ -833,12 +834,10 @@ const base: InternalAPI<NS> = {
|
||||
|
||||
return scriptsKilled > 0;
|
||||
},
|
||||
exit: (ctx: NetscriptContext) => (): void => {
|
||||
if (killWorkerScript(ctx.workerScript)) {
|
||||
exit: (ctx: NetscriptContext) => (): never => {
|
||||
helpers.log(ctx, () => "Exiting...");
|
||||
} else {
|
||||
helpers.log(ctx, () => "Failed. This is a bug. Report to dev.");
|
||||
}
|
||||
killWorkerScript(ctx.workerScript);
|
||||
throw new ScriptDeath(ctx.workerScript);
|
||||
},
|
||||
scp:
|
||||
(ctx: NetscriptContext) =>
|
||||
|
2
src/ScriptEditor/NetscriptDefinitions.d.ts
vendored
2
src/ScriptEditor/NetscriptDefinitions.d.ts
vendored
@ -5446,7 +5446,7 @@ export interface NS {
|
||||
* @remarks
|
||||
* RAM cost: 0 GB
|
||||
*/
|
||||
exit(): void;
|
||||
exit(): never;
|
||||
|
||||
/**
|
||||
* Copy file between servers.
|
||||
|
Loading…
Reference in New Issue
Block a user