From 48ce2e09ab598ceab20b3e67f6629b0b6ab5f5ea Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 11 May 2026 15:35:04 +0900
Subject: [PATCH] Update utility.ts

---
 packages/frontend/src/world/utility.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/world/utility.ts b/packages/frontend/src/world/utility.ts
index 10edb507ff..01d077c8ef 100644
--- a/packages/frontend/src/world/utility.ts
+++ b/packages/frontend/src/world/utility.ts
@@ -571,11 +571,17 @@ export class Timer {
 		this.timeoutIds.push(id);
 	}
 
-	public setInterval(callback: () => void, ms: number) {
+	public setInterval(callback: () => void, ms: number, signal?: AbortSignal) {
 		// workerで実行される可能性がある
 		// eslint-disable-next-line no-restricted-globals
 		const id = setInterval(callback, ms);
 		this.intervalIds.push(id);
+		if (signal != null) {
+			signal.addEventListener('abort', () => {
+				clearInterval(id);
+				this.intervalIds = this.intervalIds.filter(i => i !== id);
+			});
+		}
 	}
 
 	public dispose() {