Skip to content

Avoid double creating stacktrace #802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lumine1909 merged 2 commits into from
Feb 15, 2026
Merged

Avoid double creating stacktrace #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f639133
Avoid double creating stacktrace
HaHaWTH Jan 19, 2026
1fc8e51
Merge branch 'master' into avoid-double-creating-stacktrace
s-yh-china Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions leaves-server/minecraft-patches/features/0038-Catch-update-suppression-crash.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ index e08083fbb6c3090c9a6f78dbbe487cbd4fec485a..4ed941783ed038df8e94ea92cdebb72b

public static Block getBlockByColor(@Nullable DyeColor color) {
diff --git a/net/minecraft/world/level/block/state/StateHolder.java b/net/minecraft/world/level/block/state/StateHolder.java
index 040919c61ed29b3eda73b5d0f8ed905011e969a4..22dae9cf15fafda4b398025d85bad3e2a5965066 100644
index 040919c61ed29b3eda73b5d0f8ed905011e969a4..9cedf0f7433d33f303463906d59c32382441d66e 100644
--- a/net/minecraft/world/level/block/state/StateHolder.java
+++ b/net/minecraft/world/level/block/state/StateHolder.java
@@ -104,7 +104,16 @@ public abstract class StateHolder<O, S> implements ca.spottedleaf.moonrise.patch
Expand All @@ -144,7 +144,7 @@ index 040919c61ed29b3eda73b5d0f8ed905011e969a4..22dae9cf15fafda4b398025d85bad3e2
+ IllegalArgumentException iae = new IllegalArgumentException("Cannot get property " + property + " as it does not exist in " + this.owner);
+ if (org.leavesmc.leaves.LeavesConfig.modify.updateSuppressionCrashFix) {
+ org.leavesmc.leaves.util.UpdateSuppressionException exception = new org.leavesmc.leaves.util.UpdateSuppressionException(null, null, null, null, iae);
+ if (exception.getStackTrace()[1].getClassName().startsWith("net.minecraft")) {
+ if (iae.getStackTrace()[1].getClassName().startsWith("net.minecraft")) {
+ throw exception;
+ }
+ }
Expand Down
10 changes: 10 additions & 0 deletions leaves-server/src/main/java/org/leavesmc/leaves/util/UpdateSuppressionException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,4 +122,14 @@ public String getMessage() {
}
return type.getSimpleName();
}

@Override
public Throwable fillInStackTrace() {
return this;
}

@Override
public StackTraceElement[] getStackTrace() {
return this.throwable.getStackTrace(); // delegate to throwable as we don't have a stacktrace
}
}