Fixed an issue where the ParametricCallable wasn't forwarding Invocat…

…ionTargetExpections caused by CommandExceptions properly Fixes WORLDEDIT-3364
EngineHub · Jul 17, 2016 · 9effc50 · 9effc50
1 parent 52274e8
commit 9effc50
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...it-core/src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricCallable.java b/...it-core/src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricCallable.java
@@ -240,6 +240,11 @@ public Object call(String stringArguments, CommandLocals locals, String[] parent
             String name = parameter.getName();
 
             throw new InvalidUsageException("For parameter '" + name + "': " + e.getMessage(), this);
+        } catch (InvocationTargetException e) {
+            if (e.getCause() instanceof CommandException) {
+                throw (CommandException) e.getCause();
+            }
+            throw new WrappedCommandException(e);
         } catch (Throwable t) {
             throw new WrappedCommandException(t);
         }