core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stacktrace deobf when running as a bundler jar

This commit is contained in:
Kyle Wood 2021-11-26 00:33:08 -06:00 committed by MiniDigger | Martin
parent e519a51f95
commit 0675784032
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/server/0417-Deobfuscate-stacktraces-in-log-messages-crash-report.patch
View File

@ -316,16 +316,17 @@ index 0000000000000000000000000000000000000000..b8b17d046f836c8652ab094db00ab1af
+} +}
diff --git a/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java b/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java diff --git a/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java b/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..5019d22fa2ab8d72fac5ffcf5dc2a3715ae63760 index 0000000000000000000000000000000000000000..3c3051c2917548faf7e72276fb642202b33d1794
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java +++ b/src/main/java/io/papermc/paper/util/StacktraceDeobfuscator.java
@@ -0,0 +1,153 @@ @@ -0,0 +1,163 @@
+package io.papermc.paper.util; +package io.papermc.paper.util;
+ +
+import com.destroystokyo.paper.PaperConfig; +import com.destroystokyo.paper.PaperConfig;
+import it.unimi.dsi.fastutil.ints.IntArrayList; +import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList; +import it.unimi.dsi.fastutil.ints.IntList;
+import java.io.IOException; +import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections; +import java.util.Collections;
+import java.util.HashMap; +import java.util.HashMap;
+import java.util.LinkedHashMap; +import java.util.LinkedHashMap;
@ -465,7 +466,16 @@ index 0000000000000000000000000000000000000000..5019d22fa2ab8d72fac5ffcf5dc2a371
+ } + }
+ }; + };
+ try { + try {
+ final ClassReader reader = new ClassReader(key.getName()); + final @Nullable InputStream inputStream = StacktraceDeobfuscator.class.getClassLoader()
+ .getResourceAsStream(key.getName().replace('.', '/') + ".class");
+ if (inputStream == null) {
+ throw new IllegalStateException("Could not find class file: " + key.getName());
+ }
+ final byte[] classData;
+ try (inputStream) {
+ classData = inputStream.readAllBytes();
+ }
+ final ClassReader reader = new ClassReader(classData);
+ reader.accept(classVisitor, 0); + reader.accept(classVisitor, 0);
+ } catch (final IOException ex) { + } catch (final IOException ex) {
+ throw new RuntimeException(ex); + throw new RuntimeException(ex);