From dcda383dc99ffea300aa1612c27bf634c0e2d21b Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Wed, 26 Jul 2017 14:01:29 +0200 Subject: [PATCH] Allow disabling of command exception stack trace --- .../com/mojang/brigadier/exceptions/CommandException.java | 3 +++ .../exceptions/ParameterizedCommandExceptionType.java | 5 +++++ .../brigadier/exceptions/SimpleCommandExceptionType.java | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/src/main/java/com/mojang/brigadier/exceptions/CommandException.java b/src/main/java/com/mojang/brigadier/exceptions/CommandException.java index 3af98e9..5a02421 100644 --- a/src/main/java/com/mojang/brigadier/exceptions/CommandException.java +++ b/src/main/java/com/mojang/brigadier/exceptions/CommandException.java @@ -3,10 +3,13 @@ package com.mojang.brigadier.exceptions; import java.util.Map; public class CommandException extends Exception { + public static boolean ENABLE_COMMAND_STACK_TRACES = true; + private final CommandExceptionType type; private final Map data; public CommandException(final CommandExceptionType type, final Map data) { + super(type.getTypeName(), null, ENABLE_COMMAND_STACK_TRACES, ENABLE_COMMAND_STACK_TRACES); this.type = type; this.data = data; } diff --git a/src/main/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionType.java b/src/main/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionType.java index a1fa636..e05fa87 100644 --- a/src/main/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionType.java +++ b/src/main/java/com/mojang/brigadier/exceptions/ParameterizedCommandExceptionType.java @@ -64,4 +64,9 @@ public class ParameterizedCommandExceptionType implements CommandExceptionType { public int hashCode() { return getTypeName().hashCode(); } + + @Override + public String toString() { + return message; + } } diff --git a/src/main/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionType.java b/src/main/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionType.java index 93b5875..1670f5a 100644 --- a/src/main/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionType.java +++ b/src/main/java/com/mojang/brigadier/exceptions/SimpleCommandExceptionType.java @@ -39,4 +39,9 @@ public class SimpleCommandExceptionType implements CommandExceptionType { public int hashCode() { return getTypeName().hashCode(); } + + @Override + public String toString() { + return message; + } }