merge dev

src/NetscriptFunctions/Hacknet.ts

@@ -16,7 +16,7 @@ import {
 } from "../Hacknet/HacknetHelpers";
 import { HacknetServer } from "../Hacknet/HacknetServer";
 import { HacknetNode } from "../Hacknet/HacknetNode";
-import { AllServers } from "../Server/AllServers";
+import { GetServer } from "../Server/AllServers";
 
 export interface INetscriptHacknet {
   numNodes(): number;
@@ -58,7 +58,7 @@ export function NetscriptHacknet(
     if (hasHacknetServers(player)) {
       const hi = player.hacknetNodes[i];
       if (typeof hi !== "string") throw new Error("hacknet node was not a string");
-      const hserver = AllServers[hi];
+      const hserver = GetServer(hi);
       if (!(hserver instanceof HacknetServer)) throw new Error("hacknet server was not actually hacknet server");
       if (hserver == null) {
         throw helper.makeRuntimeErrorMsg(

src/NetscriptFunctions/Sleeve.ts

@@ -4,7 +4,6 @@ import { getRamCost } from "../Netscript/RamCostGenerator";
 import { FactionWorkType } from "../Faction/FactionWorkTypeEnum";
 import { SourceFileFlags } from "../SourceFile/SourceFileFlags";
 import { SleeveTaskType } from "../PersonObjects/Sleeve/SleeveTaskTypesEnum";
-import { SpecialServerIps } from "../Server/SpecialServerIps";
 import { WorkerScript } from "../Netscript/WorkerScript";
 import { findSleevePurchasableAugs } from "../PersonObjects/Sleeve/SleeveHelpers";
 import { Augmentations } from "../Augmentation/Augmentations";
@@ -231,7 +230,6 @@ export function NetscriptSleeve(
         jobs: Object.keys(player.jobs), // technically sleeves have the same jobs as the player.
         jobTitle: Object.values(player.jobs),
         maxHp: sl.max_hp,
-        tor: SpecialServerIps.hasOwnProperty("Darkweb Server"), // There's no reason not to give that infomation here as well. Worst case scenario it isn't used.
 
         mult: {
           agility: sl.agility_mult,