From 9f3bb214f70beaae8a06bad41c9b3c2bc7360474 Mon Sep 17 00:00:00 2001 From: stijnb1234 Date: Thu, 7 May 2020 14:17:53 +0200 Subject: [PATCH] Fixed typos --- src/me/mctp/MCTPAudioCmd.java | 40 +++++++++++++++++++++++++++- src/me/mctp/managers/PinManager.java | 4 --- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/me/mctp/MCTPAudioCmd.java b/src/me/mctp/MCTPAudioCmd.java index a3aecfd..064c790 100644 --- a/src/me/mctp/MCTPAudioCmd.java +++ b/src/me/mctp/MCTPAudioCmd.java @@ -20,6 +20,7 @@ public class MCTPAudioCmd implements CommandExecutor { public boolean onCommand(CommandSender sender, Command cmd, String commandlabel, String[] args) { if (cmd.getName().equalsIgnoreCase("mctpaudio")) { // /mctpaudio play SELECTOR TYPE URL + // /mctpaudio stop SELECTOR TYPE if (args.length == 4 && args[0].equalsIgnoreCase("play")) { AudioType type; try { @@ -49,7 +50,7 @@ public class MCTPAudioCmd implements CommandExecutor { if (!PinManager.hasPin(p.getUniqueId())) continue; - data.put("action", type.name()); + data.put("task", type.name()); data.put("path", args[3]); data.put("uuid", p.getUniqueId().toString().replace("-", "")); Main.getClient().sendData(data); @@ -57,6 +58,43 @@ public class MCTPAudioCmd implements CommandExecutor { sender.sendMessage(prefix + "Gestart met afspelen!"); return true; + } else if (args.length == 3 && args[0].equalsIgnoreCase("stop")) { + AudioType type; + try { + type = AudioType.valueOf(args[2].toUpperCase()); + } catch (IllegalArgumentException ex) { + sender.sendMessage(prefix + args[1] + " is geen correcte type."); + return true; + } + + ArrayList players = new ArrayList<>(); + Player target = Bukkit.getPlayer(args[1]); + if (target != null) { + if (!PinManager.hasPin(target.getUniqueId())) { + sender.sendMessage(prefix + "Die speler is niet verbonden met de client."); + return true; + } + + players.add(target); + } else { + SpigotPlayerSelector selector = new SpigotPlayerSelector(args[1]); + players.addAll(selector.getPlayers(sender)); + } + + JSONObject data; + for (Player p : players) { + data = new JSONObject(); + + if (!PinManager.hasPin(p.getUniqueId())) continue; + + data.put("task", "STOP"); + data.put("type", type.name()); + data.put("uuid", p.getUniqueId().toString().replace("-", "")); + Main.getClient().sendData(data); + } + + sender.sendMessage(prefix + "Gestopt met afspelen!"); + return true; } } else if (cmd.getName().equalsIgnoreCase("audio")) { if (!(sender instanceof Player)) { diff --git a/src/me/mctp/managers/PinManager.java b/src/me/mctp/managers/PinManager.java index ac7a73d..e4409c7 100644 --- a/src/me/mctp/managers/PinManager.java +++ b/src/me/mctp/managers/PinManager.java @@ -1,7 +1,5 @@ package me.mctp.managers; -import org.bukkit.Bukkit; - import java.security.SecureRandom; import java.util.UUID; import java.util.WeakHashMap; @@ -58,8 +56,6 @@ public class PinManager { return false; } - Bukkit.getLogger().info("PIN IN DATA: " + pins.get(pUUID) + " || But got: " + pin); - return pins.containsKey(pUUID) && pin.equals(pins.get(pUUID)); }