mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 12:20:11 +00:00
Allow Exception passed through CommandEvent to propagate (#8590)
This commit is contained in:
1 parent
8ade7bbaeb
commit
c531b2b5c7
1 file changed
+4
-2
@@ -17,7 +17,7 @@
|
||||
|
||||
this.f_82090_.findAmbiguities((p_82108_, p_82109_, p_82110_, p_82111_) -> {
|
||||
f_82089_.warn("Ambiguity between arguments {} and {} with inputs: {}", this.f_82090_.getPath(p_82109_), this.f_82090_.getPath(p_82110_), p_82111_);
|
||||
@@ -220,7 +_,15 @@
|
||||
@@ -220,7 +_,17 @@
|
||||
|
||||
try {
|
||||
try {
|
||||
@@ -25,7 +25,9 @@
|
||||
+ ParseResults<CommandSourceStack> parse = this.f_82090_.parse(stringreader, p_82118_);
|
||||
+ net.minecraftforge.event.CommandEvent event = new net.minecraftforge.event.CommandEvent(parse);
|
||||
+ if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) {
|
||||
+ if (event.getException() != null) {
|
||||
+ if (event.getException() instanceof Exception exception) {
|
||||
+ throw exception;
|
||||
+ } else if (event.getException() != null) {
|
||||
+ com.google.common.base.Throwables.throwIfUnchecked(event.getException());
|
||||
+ }
|
||||
+ return 1;
|
||||
|
||||
Reference in new issue
Block a user