diff --git a/src/main/java/us/ajg0702/queue/Main.java b/src/main/java/us/ajg0702/queue/Main.java index 3d5d0dd..65bce25 100644 --- a/src/main/java/us/ajg0702/queue/Main.java +++ b/src/main/java/us/ajg0702/queue/Main.java @@ -312,6 +312,13 @@ public class Main extends Plugin implements Listener { if(server == null) return; BungeeUtils.sendCustomData(player, "queuedfor", srv, server.getQueue().size()+""); } + if(subchannel.equals("leavequeue")) { + String arg = ""; + try { + arg = in.readUTF(); + } catch(Exception ignored) {} + getProxy().getPluginManager().dispatchCommand(player, "leavequeue"+arg); + } } catch (IOException e1) { getLogger().warning("An error occured while reading data from spigot side:"); diff --git a/src/main/java/us/ajg0702/queue/spigot/Commands.java b/src/main/java/us/ajg0702/queue/spigot/Commands.java index 67172ff..fbb60ba 100644 --- a/src/main/java/us/ajg0702/queue/spigot/Commands.java +++ b/src/main/java/us/ajg0702/queue/spigot/Commands.java @@ -16,10 +16,16 @@ public class Commands implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { - if(!(sender instanceof Player) && !(args.length > 1)) return true; - Player player = null; - if(sender instanceof Player) { - player = (Player) sender; + if(!(sender instanceof Player)) return true; + Player player = (Player) sender; + if(command.getName().equals("leavequeue")) { + StringBuilder arg = new StringBuilder(); + for(String a : args) { + arg.append(" "); + arg.append(a); + } + pl.sendMessage(player, "leavequeue", arg.toString()); + return true; } if(args.length < 1) return false; diff --git a/src/main/java/us/ajg0702/queue/spigot/Main.java b/src/main/java/us/ajg0702/queue/spigot/Main.java index 6fce5d1..5fafcc5 100644 --- a/src/main/java/us/ajg0702/queue/spigot/Main.java +++ b/src/main/java/us/ajg0702/queue/spigot/Main.java @@ -28,6 +28,7 @@ public class Main extends JavaPlugin implements PluginMessageListener,Listener { getServer().getMessenger().registerOutgoingPluginChannel(this, "ajqueue:tobungee"); this.getCommand("move").setExecutor(new Commands(this)); + this.getCommand("leavequeue").setExecutor(new Commands(this)); Bukkit.getPluginManager().registerEvents(this, this); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 67a2906..81632df 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -7,4 +7,7 @@ softdepend: [PlaceholderAPI] commands: move: aliases: [server, queue, joinq, joinqueue] - description: Queue for a server \ No newline at end of file + description: Queue for a server + leavequeue: + aliases: [leaveq] + description: Leaves a queue \ No newline at end of file