From b9801ebf579ffadeb2cf2d3f68ade4dd57fa43c2 Mon Sep 17 00:00:00 2001
From: Wyatt Childers <wchilders@nearce.com>
Date: Sun, 17 Jul 2016 19:02:43 -0400
Subject: [PATCH] Fixed an issue where the ParametricCallable wasn't forwarding
 InvocationTargetExpections caused by CommandExceptions properly

Fixes WORLDEDIT-3364
---
 .../util/command/parametric/ParametricCallable.java          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricCallable.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricCallable.java
index 1c65de6c5..5492a2e81 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricCallable.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/command/parametric/ParametricCallable.java
@@ -240,6 +240,11 @@ class ParametricCallable implements CommandCallable {
             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);
         }