Fixed setTimeout being registered for startup scripts on client side

KubeJS-Mods · Nov 2, 2023 · db806e9 · db806e9
1 parent 0108f25
commit db806e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/common/src/main/java/dev/latvian/mods/kubejs/BuiltinKubeJSPlugin.java b/common/src/main/java/dev/latvian/mods/kubejs/BuiltinKubeJSPlugin.java
@@ -342,7 +342,7 @@ public void registerBindings(BindingsEvent event) {
 		event.add("onEvent", new LegacyCodeHandler("onEvent()"));
 		event.add("java", new LegacyCodeHandler("java()"));
 
-		if (event.manager instanceof ServerScriptManager sm && sm.server != null) {
+		if (event.getType().isServer() && event.manager instanceof ServerScriptManager sm && sm.server != null) {
 			var se = sm.server.kjs$getScheduledEvents();
 
 			event.add("setTimeout", new ScheduledEvents.TimeoutJSFunction(se, false, false));

diff --git a/common/src/main/java/dev/latvian/mods/kubejs/client/BuiltinKubeJSClientPlugin.java b/common/src/main/java/dev/latvian/mods/kubejs/client/BuiltinKubeJSClientPlugin.java
@@ -23,11 +23,13 @@ public void registerBindings(BindingsEvent event) {
 		event.add("Client", Minecraft.getInstance());
 		event.add("Painter", Painter.INSTANCE);
 
-		var se = Minecraft.getInstance().kjs$getScheduledEvents();
+		if (event.getType().isClient()) {
+			var se = Minecraft.getInstance().kjs$getScheduledEvents();
 
-		event.add("setTimeout", new ScheduledEvents.TimeoutJSFunction(se, false, false));
-		event.add("clearTimeout", new ScheduledEvents.TimeoutJSFunction(se, true, false));
-		event.add("setInterval", new ScheduledEvents.TimeoutJSFunction(se, false, true));
-		event.add("clearInterval", new ScheduledEvents.TimeoutJSFunction(se, true, true));
+			event.add("setTimeout", new ScheduledEvents.TimeoutJSFunction(se, false, false));
+			event.add("clearTimeout", new ScheduledEvents.TimeoutJSFunction(se, true, false));
+			event.add("setInterval", new ScheduledEvents.TimeoutJSFunction(se, false, true));
+			event.add("clearInterval", new ScheduledEvents.TimeoutJSFunction(se, true, true));
+		}
 	}
 }