From a5bb7373ff46b3d12ddc294bebdb096dcd783d21 Mon Sep 17 00:00:00 2001 From: cnaude Date: Sat, 13 Aug 2016 08:17:10 -0700 Subject: [PATCH] Handle vanilla commands in 1.10 --- .../com/cnaude/purpleirc/CommandQueueWatcher.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/cnaude/purpleirc/CommandQueueWatcher.java b/src/main/java/com/cnaude/purpleirc/CommandQueueWatcher.java index f9cc9aa..c0092d5 100644 --- a/src/main/java/com/cnaude/purpleirc/CommandQueueWatcher.java +++ b/src/main/java/com/cnaude/purpleirc/CommandQueueWatcher.java @@ -61,13 +61,20 @@ private void queueAndSend() { isCommandBookCommand = plugin.commandBookHook.isCommandBookCommand(cmd); plugin.logDebug("Is this is a CommandBook command? " + Boolean.toString(isCommandBookCommand)); } - if ((plugin.getServer().getVersion().contains("MC: 1.8") - && plugin.getServer().getVersion().contains("Spigot") + if ( + (plugin.getServer().getVersion().contains("MC: 1.8") + && (plugin.getServer().getVersion().contains("Spigot")) && plugin.getServer().getPluginCommand(cmd) == null && !isCommandBookCommand) - || (plugin.getServer().getVersion().contains("MC: 1.9") + || + (plugin.getServer().getVersion().contains("MC: 1.9") && plugin.getServer().getPluginCommand(cmd) == null - && !isCommandBookCommand)) { + && !isCommandBookCommand) + || + (plugin.getServer().getVersion().contains("MC: 1.10") + && plugin.getServer().getPluginCommand(cmd) == null + && !isCommandBookCommand) + ) { plugin.logDebug("Dispatching command as ConsoleSender: " + ircCommand.getGameCommand()); plugin.getServer().dispatchCommand(ircCommand.getIRCConsoleCommandSender(), ircCommand.getGameCommand());