Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-23 16:13:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1446 from danielyxie/dev

Browse Source 
fix server ram recalc
This commit is contained in:
hydroflame 2021-10-08 23:46:18 -04:00 committed by GitHub
commit 2d342b17c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dist/vendor.bundle.js vendored
View File

File diff suppressed because one or more lines are too long

4
main.bundle.js
View File

File diff suppressed because one or more lines are too long

2
main.bundle.js.map
View File

File diff suppressed because one or more lines are too long

13
src/Netscript/killWorkerScript.ts
View File

@ -90,15 +90,6 @@ function removeWorkerScript(workerScript: WorkerScript, rerenderUi = true): void
return; return;
} }
// Recalculate ram used on that server
server.ramUsed = roundToTwo(server.ramUsed - workerScript.ramUsage);
if (server.ramUsed < 0) {
console.warn(
`Server (${server.hostname}) RAM usage went negative (if it's due to floating pt imprecision, it's okay): ${server.ramUsed}`,
);
server.ramUsed = 0;
}
// Delete the RunningScript object from that server // Delete the RunningScript object from that server
for (let i = 0; i < server.runningScripts.length; ++i) { for (let i = 0; i < server.runningScripts.length; ++i) {
const runningScript = server.runningScripts[i]; const runningScript = server.runningScripts[i];
@ -108,6 +99,10 @@ function removeWorkerScript(workerScript: WorkerScript, rerenderUi = true): void
} }
} }
// Recalculate ram used on that server
server.ramUsed = 0;
for (const rs of server.runningScripts) server.ramUsed += rs.ramUsage;
// Delete script from global pool (workerScripts) // Delete script from global pool (workerScripts)
const res = workerScripts.delete(workerScript.pid); const res = workerScripts.delete(workerScript.pid);
if (!res) { if (!res) {