ScriptVM: Catch exceptions thrown from a JavaScriptCallback

These shouldn't crash the client
2018-11-18 16:33:26 -07:00
parent b1dd15722d
commit b8ff7f8412
1 changed files with 8 additions and 1 deletions
--- 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;
 		}