From b8ff7f84124d1682b48cb4e48085e54c4f98a2d7 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sun, 18 Nov 2018 16:33:26 -0700 Subject: [PATCH] ScriptVM: Catch exceptions thrown from a JavaScriptCallback These shouldn't crash the client --- .../src/main/java/net/runelite/mixins/ScriptVMMixin.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java index 7293f9daa1..29f632576a 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java @@ -119,7 +119,14 @@ public abstract class ScriptVMMixin implements RSClient Object[] arguments = event.getArguments(); if (arguments != null && arguments.length > 0 && arguments[0] instanceof JavaScriptCallback) { - ((JavaScriptCallback) arguments[0]).run(event); + try + { + ((JavaScriptCallback) arguments[0]).run(event); + } + catch (Exception e) + { + client.getLogger().error("Error in JavaScriptCallback", e); + } return; }