From ad7f782a1a42401318b3aa34565fffe01a7dba49 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Mon, 8 Nov 2021 12:09:08 +0100 Subject: [PATCH] Fix InformativeException NPE --- .../exception/InformativeException.java | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/api/src/main/java/com/viaversion/viaversion/exception/InformativeException.java b/api/src/main/java/com/viaversion/viaversion/exception/InformativeException.java index b91b4e32f..9ab7f6d73 100644 --- a/api/src/main/java/com/viaversion/viaversion/exception/InformativeException.java +++ b/api/src/main/java/com/viaversion/viaversion/exception/InformativeException.java @@ -43,25 +43,21 @@ public class InformativeException extends Exception { } private String getSource(Class sourceClazz) { - if (sourceClazz.isAnonymousClass()) { - return sourceClazz.getName() + " (Anonymous)"; - } else { - return sourceClazz.getName(); - } + return sourceClazz.isAnonymousClass() ? sourceClazz.getName() + " (Anonymous)" : sourceClazz.getName(); } @Override public String getMessage() { - StringBuilder builder = new StringBuilder(); - builder.append("Please post this error to https://github.com/ViaVersion/ViaVersion/issues and follow the issue template\n{"); - int i = 0; + StringBuilder builder = new StringBuilder("Please post this error to https://github.com/ViaVersion/ViaVersion/issues and follow the issue template\n{"); + boolean first = true; for (Map.Entry entry : info.entrySet()) { - builder.append(i == 0 ? "" : ", ").append(entry.getKey()).append(": ").append(entry.getValue().toString()); - i++; + if (!first) { + builder.append(", "); + } + builder.append(entry.getKey()).append(": ").append(entry.getValue()); + first = false; } - builder.append("}\nActual Error: "); - - return builder.toString(); + return builder.append("}\nActual Error: ").toString(); } @Override