Better errors when update check fails

BlueTree242 · Mar 25, 2024 · 44e5d76 · 44e5d76
1 parent 63c0281
commit 44e5d76
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/bungee/src/main/java/dev/bluetree242/advancedplhide/bungee/AdvancedPlHideBungee.java b/bungee/src/main/java/dev/bluetree242/advancedplhide/bungee/AdvancedPlHideBungee.java
@@ -111,7 +111,7 @@ public void performStartUpdateCheck() {
                         getLogger().severe(msg);
                         break;
                 }
-            } catch (Exception ex) {
+            } catch (Throwable ex) {
                 getLogger().severe(String.format("Could not check for updates: %s", ex.getMessage()));
             }
         });

diff --git a/...c/main/java/dev/bluetree242/advancedplhide/bungee/listener/event/BungeeEventListener.java b/...c/main/java/dev/bluetree242/advancedplhide/bungee/listener/event/BungeeEventListener.java
@@ -72,7 +72,7 @@ public void onPlayerJoin(PostLoginEvent e) {
                     if (msg != null) {
                         e.getPlayer().sendMessage(msg);
                     }
-                } catch (Exception ex) {
+                } catch (Throwable ex) {
                     core.getLogger().severe(String.format("Could not check for updates: %s", ex.getMessage()));
                 }
             });

diff --git a/core/src/main/java/dev/bluetree242/advancedplhide/CompleterModifier.java b/core/src/main/java/dev/bluetree242/advancedplhide/CompleterModifier.java
@@ -29,7 +29,7 @@
 import java.util.List;
 
 public class CompleterModifier {
-    private static final List BAD_COMMANDS = Arrays.asList("ver", "version", "plugins", "bukkit:plugins", "bukkit:ver", "bukkit:version", "about", "bukkit:about", "?", "minecraft:?");
+    private static final List<String> BAD_COMMANDS = Arrays.asList("ver", "version", "plugins", "bukkit:plugins", "bukkit:ver", "bukkit:version", "about", "bukkit:about", "?", "minecraft:?");
 
     public static void removePluginPrefix(CommandCompleterList list) {
         for (CommandCompleter completer : new ArrayList<>(list)) {

diff --git a/core/src/main/java/dev/bluetree242/advancedplhide/PlatformPlugin.java b/core/src/main/java/dev/bluetree242/advancedplhide/PlatformPlugin.java
@@ -97,7 +97,7 @@ public Group mergeGroups(List<Group> groups) {
         return new Group(name, tabcomplete);
     }
 
-    public UpdateCheckResult updateCheck() {
+    public UpdateCheckResult updateCheck() throws Throwable {
         try {
             HttpClient client = HttpClient.newBuilder()
                     .withBaseURL("https://advancedplhide.bluetree242.dev")
@@ -116,8 +116,8 @@ public UpdateCheckResult updateCheck() {
                     .execute();
             JSONObject json = new JSONObject(new String(Objects.requireNonNull(response).getRawResponse(), StandardCharsets.UTF_8));
             return new UpdateCheckResult(json.getInt("versions_behind"), json.isNull("message") ? null : json.getString("message"), json.isNull("type") ? "INFO" : json.getString("type"), json.getString("downloadUrl"));
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+        } catch (RuntimeException e) {
+            throw e.getCause();
         }
     }
 

diff --git a/spigot/src/main/java/dev/bluetree242/advancedplhide/spigot/AdvancedPlHideSpigot.java b/spigot/src/main/java/dev/bluetree242/advancedplhide/spigot/AdvancedPlHideSpigot.java
@@ -128,7 +128,7 @@ public void performStartUpdateCheck() {
                         getLogger().severe(msg);
                         break;
                 }
-            } catch (Exception ex) {
+            } catch (Throwable ex) {
                 getLogger().severe(String.format("Could not check for updates: %s", ex.getMessage()));
             }
         });

diff --git a/...c/main/java/dev/bluetree242/advancedplhide/spigot/listener/event/SpigotEventListener.java b/...c/main/java/dev/bluetree242/advancedplhide/spigot/listener/event/SpigotEventListener.java
@@ -65,7 +65,7 @@ public void onPlayerJoin(PlayerJoinEvent e) {
                     if (msg != null) {
                         e.getPlayer().sendMessage(msg);
                     }
-                } catch (Exception ex) {
+                } catch (Throwable ex) {
                     core.getLogger().severe(String.format("Could not check for updates: %s", ex.getMessage()));
                 }
             });

diff --git a/velocity/src/main/java/dev/bluetree242/advancedplhide/velocity/AdvancedPlHideVelocity.java b/velocity/src/main/java/dev/bluetree242/advancedplhide/velocity/AdvancedPlHideVelocity.java
@@ -158,7 +158,7 @@ public void performStartUpdateCheck() {
                     logger.error(msg);
                     break;
             }
-        } catch (Exception ex) {
+        } catch (Throwable ex) {
             logger.error(String.format("Could not check for updates: %s", ex.getMessage()));
         }
     }

diff --git a/...in/java/dev/bluetree242/advancedplhide/velocity/listener/event/VelocityEventListener.java b/...in/java/dev/bluetree242/advancedplhide/velocity/listener/event/VelocityEventListener.java
@@ -58,7 +58,7 @@ public void onPlayerJoin(PostLoginEvent e) {
                         msg = msg.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.OPEN_URL, result.getUpdateUrl()));
                         e.getPlayer().sendMessage(msg);
                     }
-                } catch (Exception ex) {
+                } catch (Throwable ex) {
                     core.getLogger().error(String.format("Could not check for updates: %s", ex.getMessage()));
                 }
             }).schedule();