fix(engine): send reboot timer on reconnect (#1233)

Co-authored-by: sentientflare <179689881+sentientflare@users.noreply.github.com>
2004Scape · Pazaz · Feb 10, 2025 · Feb 9, 2025 · Feb 9, 2025 · Feb 9, 2025
commit bbb9a14f3b1fd817b7c5f22a5e92c05659d33a31
diff --git a/src/engine/World.ts b/src/engine/World.ts
@@ -80,7 +80,7 @@
 import ScriptPointer from '#/engine/script/ScriptPointer.js';
 import Isaac from '#/io/Isaac.js';
 import LoggerEventType from '#/server/logger/LoggerEventType.js';
 import MoveSpeed from '#/engine/entity/MoveSpeed.js';
 import ScriptVarType from '#/cache/config/ScriptVarType.js';

 const priv = forge.pki.privateKeyFromPem(
@@ -963,7 +963,7 @@
            try {
                // if it throws then there was no available pid. otherwise guaranteed to not be -1.
                pid = this.getNextPid(isClientConnected(player) ? player.client : null);
            } catch (e) {
                // world full
                if (isClientConnected(player)) {
                    player.addSessionLog(LoggerEventType.ENGINE, 'Tried to log in - world full');
@@ -1697,6 +1697,14 @@
         }
     }
 
+    get isPendingShutdown(): boolean {
+        return this.shutdownTicksRemaining > -1;
+    }
+
+    get shutdownTicksRemaining(): number {
+        return this.shutdownTick - this.currentTick;
+    }
+
     broadcastMes(message: string): void {
         for (const player of this.players) {
             if (message.includes('\n')) {
@@ -1715,7 +1723,7 @@
        }
    }

    onLoginMessage(msg: any) {
        const { type } = msg;

        if (type === 'player_login') {
@@ -1801,7 +1809,7 @@
        }
    }

    onFriendMessage({ opcode, data }: { opcode: FriendsServerOpcodes, data: any }) {
        try {
            if (opcode === FriendsServerOpcodes.UPDATE_FRIENDLIST) {
                const username37 = BigInt(data.username37);

diff --git a/src/engine/entity/Player.ts b/src/engine/entity/Player.ts
@@ -77,6 +77,7 @@
 import LoggerEventType from '#/server/logger/LoggerEventType.js';
 import InputTracking from '#/engine/entity/tracking/InputTracking.js';
 import Visibility from './Visibility.js';
+import UpdateRebootTimer from '#/network/server/model/UpdateRebootTimer.js';
 
 const levelExperience = new Int32Array(99);
 
@@ -401,6 +402,11 @@
         // force resyncing
         // reload entity info (overkill? does the client have some logic around this?)
         this.buildArea.clear(true);
+        // in case of pending update
+        if (World.isPendingShutdown) {
+            const ticksBeforeShutdown = World.shutdownTicksRemaining;
+            this.write(new UpdateRebootTimer(ticksBeforeShutdown));
+        }
         // rebuild scene (rebuildnormal won't run if you're in the same zone!)
         this.originX = -1;
         this.originZ = -1;
@@ -1010,7 +1016,7 @@
            return;
        }

        const opTrigger = this.getOpTrigger();
        this.nextTarget = null;

        // opplayer3 is `Follow`
@@ -1201,7 +1207,7 @@
        }
    }

    getInventoryFromListener(listener: any) {
        if (listener.source === -1) {
            return World.getInventory(listener.type);
        } else {

diff --git a/src/cache/PackAll.ts b/src/cache/PackAll.ts

    try {
        child_process.execSync(`"${Environment.BUILD_JAVA_PATH}" -jar RuneScriptCompiler.jar`, { stdio: 'inherit' });
    } catch (err) {
        throw new Error('Failed to compile scripts.');
    }

diff --git a/src/engine/script/ScriptRunner.ts b/src/engine/script/ScriptRunner.ts
                    printWarning(message);
                }
            }
        } catch (err: any) {
            // print the last opcode executed
            if (state.pc >= 0 && state.pc < state.script.opcodes.length) {
                const opcode = state.script.opcodes[state.pc];
diff --git a/src/engine/script/ServerTriggerType.ts b/src/engine/script/ServerTriggerType.ts
    AI_SPAWN = 166
 }

 namespace ServerTriggerType {
    export function toString(trigger: ServerTriggerType) {
        return ServerTriggerType[trigger].toLowerCase();
    }
diff --git a/src/engine/script/handlers/PlayerOps.ts b/src/engine/script/handlers/PlayerOps.ts

 import { PlayerQueueType, ScriptArgument } from '#/engine/entity/EntityQueueRequest.js';
 import { PlayerTimerType } from '#/engine/entity/EntityTimer.js';
 import { isBufferFull, isClientConnected } from '#/engine/entity/NetworkPlayer.js';
 import { CoordGrid } from '#/engine/CoordGrid.js';
 import CameraInfo from '#/engine/entity/CameraInfo.js';
 import Interaction from '#/engine/entity/Interaction.js';

	try {
	child_process.execSync(`"${Environment.BUILD_JAVA_PATH}" -jar RuneScriptCompiler.jar`, { stdio: 'inherit' });
	} catch (err) {
Check warning on line 54 in src/cache/PackAll.ts GitHub Actions / verify `'err' is defined but never used`
	throw new Error('Failed to compile scripts.');
	}
	printWarning(message);
	}
	}
	} catch (err: any) {
Check warning on line 158 in src/engine/script/ScriptRunner.ts GitHub Actions / verify `Unexpected any. Specify a different type`
	// print the last opcode executed
	if (state.pc >= 0 && state.pc < state.script.opcodes.length) {
	const opcode = state.script.opcodes[state.pc];
	AI_SPAWN = 166
	}

	namespace ServerTriggerType {
Check warning on line 164 in src/engine/script/ServerTriggerType.ts GitHub Actions / verify `ES2015 module syntax is preferred over namespaces`
	export function toString(trigger: ServerTriggerType) {
	return ServerTriggerType[trigger].toLowerCase();
	}

	import { PlayerQueueType, ScriptArgument } from '#/engine/entity/EntityQueueRequest.js';
	import { PlayerTimerType } from '#/engine/entity/EntityTimer.js';
	import { isBufferFull, isClientConnected } from '#/engine/entity/NetworkPlayer.js';
Check warning on line 18 in src/engine/script/handlers/PlayerOps.ts GitHub Actions / verify `'isClientConnected' is defined but never used. Allowed unused vars must match /^_/u`
	import { CoordGrid } from '#/engine/CoordGrid.js';
	import CameraInfo from '#/engine/entity/CameraInfo.js';
	import Interaction from '#/engine/entity/Interaction.js';