diff --git a/src/main/java/org/maxgamer/quickshop/command/CommandContainer.java b/src/main/java/org/maxgamer/quickshop/command/CommandContainer.java index 247cf03f0..59878b68f 100644 --- a/src/main/java/org/maxgamer/quickshop/command/CommandContainer.java +++ b/src/main/java/org/maxgamer/quickshop/command/CommandContainer.java @@ -29,6 +29,7 @@ import org.jetbrains.annotations.Nullable; import org.maxgamer.quickshop.util.MsgUtil; import java.lang.reflect.Method; +import java.lang.reflect.Modifier; import java.util.List; import java.util.function.Function; @@ -68,12 +69,17 @@ public class CommandContainer { return executorType; } + public T cast(Object type) { + + return (T) type; + } + public void bakeExecutorType() { for (Method declaredMethod : getExecutor().getClass().getDeclaredMethods()) { if (!"onCommand".equals(declaredMethod.getName()) && !"onTabComplete".equals(declaredMethod.getName())) { continue; } - if (declaredMethod.getParameterCount() != 3) { + if (declaredMethod.getParameterCount() != 3 || declaredMethod.getModifiers() != Modifier.PUBLIC) { continue; } executorType = declaredMethod.getParameterTypes()[0]; diff --git a/src/main/java/org/maxgamer/quickshop/command/CommandManager.java b/src/main/java/org/maxgamer/quickshop/command/CommandManager.java index f08b88732..74e06593c 100644 --- a/src/main/java/org/maxgamer/quickshop/command/CommandManager.java +++ b/src/main/java/org/maxgamer/quickshop/command/CommandManager.java @@ -408,11 +408,11 @@ public class CommandManager implements TabCompleter, CommandExecutor { } Util.debugLog("Execute container: " + container.getPrefix() + " - " + cmdArg[0]); - ((CommandHandler) container.getExecutor()).onCommand(sender, commandLabel, passThroughArgs); + container.getExecutor().onCommand(container.cast(sender), commandLabel, passThroughArgs); return true; } Util.debugLog("All checks failed, print helps"); - ((CommandHandler) rootContainer.getExecutor()).onCommand(sender, commandLabel, passThroughArgs); + rootContainer.getExecutor().onCommand(rootContainer.cast(sender), commandLabel, passThroughArgs); } return true; } @@ -462,13 +462,8 @@ public class CommandManager implements TabCompleter, CommandExecutor { private boolean isAdapt(CommandContainer container, CommandSender sender) { - try { - sender.getClass().cast(container.getExecutorType()); - //container.getExecutorType().cast(sender); - return true; - } catch (ClassCastException exception) { - return false; - } + return container.getExecutorType().isInstance(sender); + } @Override @@ -507,7 +502,7 @@ public class CommandManager implements TabCompleter, CommandExecutor { return Collections.emptyList(); } Util.debugLog("Tab-complete container: " + container.getPrefix()); - return ((CommandHandler) container.getExecutor()).onTabComplete(sender, commandLabel, passThroughArgs); + return container.getExecutor().onTabComplete(container.cast(sender), commandLabel, passThroughArgs); } return Collections.emptyList();