diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java index 1da03b8a7..5a9162ee4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/VerboseHandler.java @@ -80,7 +80,7 @@ public class VerboseHandler implements AutoCloseable { return; } - StackTraceElement[] trace = new Exception().getStackTrace(); + Throwable trace = new Throwable(); String thread = Thread.currentThread().getName(); // add the check data to a queue to be processed later. @@ -105,7 +105,7 @@ public class VerboseHandler implements AutoCloseable { return; } - StackTraceElement[] trace = new Exception().getStackTrace(); + Throwable trace = new Throwable(); String thread = Thread.currentThread().getName(); // add the check data to a queue to be processed later. diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/event/MetaCheckEvent.java b/common/src/main/java/me/lucko/luckperms/common/verbose/event/MetaCheckEvent.java index ccfc90231..f43b40eb5 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/event/MetaCheckEvent.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/event/MetaCheckEvent.java @@ -46,7 +46,7 @@ public class MetaCheckEvent extends VerboseEvent { */ private final String result; - public MetaCheckEvent(Origin origin, String checkTarget, QueryOptions checkQueryOptions, StackTraceElement[] checkTrace, String checkThread, String key, String result) { + public MetaCheckEvent(Origin origin, String checkTarget, QueryOptions checkQueryOptions, Throwable checkTrace, String checkThread, String key, String result) { super(checkTarget, checkQueryOptions, checkTrace, checkThread); this.origin = origin; this.key = key; diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/event/PermissionCheckEvent.java b/common/src/main/java/me/lucko/luckperms/common/verbose/event/PermissionCheckEvent.java index 9971ec7b7..52253cbd7 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/event/PermissionCheckEvent.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/event/PermissionCheckEvent.java @@ -47,7 +47,7 @@ public class PermissionCheckEvent extends VerboseEvent { */ private final TristateResult result; - public PermissionCheckEvent(Origin origin, String checkTarget, QueryOptions checkQueryOptions, StackTraceElement[] checkTrace, String checkThread, String permission, TristateResult result) { + public PermissionCheckEvent(Origin origin, String checkTarget, QueryOptions checkQueryOptions, Throwable checkTrace, String checkThread, String permission, TristateResult result) { super(checkTarget, checkQueryOptions, checkTrace, checkThread); this.origin = origin; this.permission = permission; diff --git a/common/src/main/java/me/lucko/luckperms/common/verbose/event/VerboseEvent.java b/common/src/main/java/me/lucko/luckperms/common/verbose/event/VerboseEvent.java index 3e8ee9e25..e6248e214 100644 --- a/common/src/main/java/me/lucko/luckperms/common/verbose/event/VerboseEvent.java +++ b/common/src/main/java/me/lucko/luckperms/common/verbose/event/VerboseEvent.java @@ -54,16 +54,16 @@ public abstract class VerboseEvent implements VariableEvaluator { private final QueryOptions checkQueryOptions; /** - * The stack trace when the check took place + * The throwable created when the check took place */ - private final StackTraceElement[] checkTrace; + private final Throwable checkTrace; /** * The name of the thread where the check took place */ private final String checkThread; - protected VerboseEvent(String checkTarget, QueryOptions checkQueryOptions, StackTraceElement[] checkTrace, String checkThread) { + protected VerboseEvent(String checkTarget, QueryOptions checkQueryOptions, Throwable checkTrace, String checkThread) { this.checkTarget = checkTarget; this.checkQueryOptions = checkQueryOptions; this.checkTrace = checkTrace; @@ -79,7 +79,7 @@ public abstract class VerboseEvent implements VariableEvaluator { } public StackTraceElement[] getCheckTrace() { - return this.checkTrace; + return this.checkTrace.getStackTrace(); } public String getCheckThread() { @@ -107,7 +107,7 @@ public abstract class VerboseEvent implements VariableEvaluator { }) .add("trace", new JArray() .consume(arr -> { - int overflow = tracePrinter.process(this.checkTrace, StackTracePrinter.elementToString(arr::add)); + int overflow = tracePrinter.process(getCheckTrace(), StackTracePrinter.elementToString(arr::add)); if (overflow != 0) { arr.add("... and " + overflow + " more"); }