From 1c459084ac1ad958b1bf4fa0981ff30471aa85cc Mon Sep 17 00:00:00 2001 From: ThatGamerBlue Date: Wed, 23 Jun 2021 19:01:33 +0100 Subject: [PATCH] catch all throwables in event handlers --- .../src/main/java/net/runelite/api/widgets/WidgetInfo.java | 1 + .../src/main/java/net/runelite/client/eventbus/EventBus.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 9f073d8b94..90e49bdede 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -613,6 +613,7 @@ public enum WidgetInfo DIALOG_PLAYER_NAME(WidgetID.DIALOG_PLAYER_GROUP_ID, WidgetID.DialogPlayer.NAME), DIALOG_PLAYER_HEAD_MODEL(WidgetID.DIALOG_PLAYER_GROUP_ID, WidgetID.DialogPlayer.HEAD_MODEL), + DIALOG_OPTION_OPTION1(WidgetID.DIALOG_OPTION_GROUP_ID, WidgetID.DialogOption.OPTIONS), DIALOG_NOTIFICATION_TEXT(WidgetID.DIALOG_NOTIFICATION_GROUP_ID, WidgetID.DialogNotification.TEXT), DIALOG_NOTIFICATION_CONTINUE(WidgetID.DIALOG_NOTIFICATION_GROUP_ID, WidgetID.DialogNotification.CONTINUE), diff --git a/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java b/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java index a2f05f4483..4e0ca89965 100644 --- a/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java +++ b/runelite-client/src/main/java/net/runelite/client/eventbus/EventBus.java @@ -215,8 +215,10 @@ public class EventBus { subscriber.invoke(event); } - catch (Exception e) + catch (Throwable e) { + // here i'd really like to disable the bad plugin, + // but failing that i can't do much... exceptionHandler.accept(e); } }