diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-10-15 02:43:07 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-10-16 00:50:06 +0800 |
| commit | a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a (patch) | |
| tree | 8f35ef541a5bace21530db7e9ffeed9d1060facf /runtime | |
| parent | c65b2a347b38724ccb777114f5353e7f18b978b5 (diff) | |
| download | RoughlyEnoughItems-a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a.tar.gz RoughlyEnoughItems-a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a.tar.bz2 RoughlyEnoughItems-a7b0a0dd4b305eb8655b008ebcfdcd2f7b70079a.zip | |
Fix merge conflicts
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java index ac7cc3777..d3159a9ca 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/util/CrashReportUtils.java @@ -35,8 +35,8 @@ public class CrashReportUtils { Throwable temp = throwable; while (temp != null) { temp = temp.getCause(); - if (temp instanceof ReportedException reportedException) { - return essential(reportedException, task); + if (temp instanceof ReportedException) { + return essential(temp, task); } } CrashReport report = CrashReport.forThrowable(throwable, task); |