From 6492eb96832a7be8e71c79fec3cb2a6a35392d12 Mon Sep 17 00:00:00 2001
From: Bukkit/Spigot <noreply+git-bukkit@papermc.io>
Date: Sat, 11 Feb 2012 02:16:16 +0100
Subject: [PATCH] [Bleeding] Cleanup of exceptions org.bukkit.plugin.Invalid*

Removed throwable and message, because the superclass already stores them
Added message of inner exception to the outer exception to make the first line of the stacktrace more verbose

By: Zeerix <zeerix@draig.de>
---
 .../plugin/InvalidDescriptionException.java   | 42 ++++++-------------
 .../bukkit/plugin/InvalidPluginException.java | 19 ++-------
 2 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/paper-api/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java b/paper-api/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java
index c2de542c74..ee787f7b12 100644
--- a/paper-api/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/InvalidDescriptionException.java
@@ -5,16 +5,24 @@ package org.bukkit.plugin;
  */
 public class InvalidDescriptionException extends Exception {
     private static final long serialVersionUID = 5721389122281775894L;
-    private final Throwable cause;
-    private final String message;
+
+    /**
+     * Constructs a new InvalidDescriptionException based on the given Exception
+     *
+     * @param message Brief message explaining the cause of the exception
+     * @param cause Exception that triggered this Exception
+     */
+    public InvalidDescriptionException(final Throwable cause, final String message) {
+        super(message + (cause != null ? ": " + cause.getMessage() : ""), cause);
+    }
 
     /**
      * Constructs a new InvalidDescriptionException based on the given Exception
      *
      * @param throwable Exception that triggered this Exception
      */
-    public InvalidDescriptionException(Throwable throwable) {
-        this(throwable, "Invalid plugin.yml");
+    public InvalidDescriptionException(final Throwable cause) {
+        this(cause, "Invalid plugin.yml");
     }
 
     /**
@@ -26,36 +34,10 @@ public class InvalidDescriptionException extends Exception {
         this(null, message);
     }
 
-    /**
-     * Constructs a new InvalidDescriptionException based on the given Exception
-     *
-     * @param message Brief message explaining the cause of the exception
-     * @param throwable Exception that triggered this Exception
-     */
-    public InvalidDescriptionException(final Throwable throwable, final String message) {
-        this.cause = null;
-        this.message = message;
-    }
-
     /**
      * Constructs a new InvalidDescriptionException
      */
     public InvalidDescriptionException() {
         this(null, "Invalid plugin.yml");
     }
-
-    /**
-     * If applicable, returns the Exception that triggered this Exception
-     *
-     * @return Inner exception, or null if one does not exist
-     */
-    @Override
-    public Throwable getCause() {
-        return cause;
-    }
-
-    @Override
-    public String getMessage() {
-        return message;
-    }
 }
diff --git a/paper-api/src/main/java/org/bukkit/plugin/InvalidPluginException.java b/paper-api/src/main/java/org/bukkit/plugin/InvalidPluginException.java
index 033ff922bd..c473614049 100644
--- a/paper-api/src/main/java/org/bukkit/plugin/InvalidPluginException.java
+++ b/paper-api/src/main/java/org/bukkit/plugin/InvalidPluginException.java
@@ -5,31 +5,20 @@ package org.bukkit.plugin;
  */
 public class InvalidPluginException extends Exception {
     private static final long serialVersionUID = -8242141640709409542L;
-    private final Throwable cause;
 
     /**
      * Constructs a new InvalidPluginException based on the given Exception
      *
-     * @param throwable Exception that triggered this Exception
+     * @param cause Exception that triggered this Exception
      */
-    public InvalidPluginException(Throwable throwable) {
-        cause = throwable;
+    public InvalidPluginException(final Throwable cause) {
+        super("Invalid plugin" + (cause != null ? ": " + cause.getMessage() : ""), cause);
     }
 
     /**
      * Constructs a new InvalidPluginException
      */
     public InvalidPluginException() {
-        cause = null;
-    }
-
-    /**
-     * If applicable, returns the Exception that triggered this Exception
-     *
-     * @return Inner exception, or null if one does not exist
-     */
-    @Override
-    public Throwable getCause() {
-        return cause;
+        this(null);
     }
 }