🔥 Now is a Player only required for the gui command.

This commit is contained in:
stijnb1234 2020-12-08 21:00:39 +01:00
parent 8e44ce7c1d
commit 26e9f6e2c9

View file

@ -25,43 +25,37 @@ public class ShowCMD implements CommandExecutor {
@Override @Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, @NotNull String[] args) { public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, @NotNull String[] args) {
if (label.equalsIgnoreCase("mctpshow")) { if (label.equalsIgnoreCase("mctpshow")) {
if (!(sender instanceof Player)) { if (!sender.hasPermission("mctp.show")) {
sender.sendMessage(ChatColor.RED + "Je moet een speler zijn om dit te doen."); sender.sendMessage(ChatColor.RED + "Je hebt hier geen permissie voor.");
return false;
}
Player p = (Player) sender;
if (!p.hasPermission("mctp.show")) {
p.sendMessage(ChatColor.RED + "Je hebt hier geen permissie voor.");
return false; return false;
} }
if (args.length == 2 && args[0].equalsIgnoreCase("create")) { if (args.length == 2 && args[0].equalsIgnoreCase("create")) {
String name = args[1]; String name = args[1];
if (Shows.exists(name)) { if (Shows.exists(name)) {
p.sendMessage(ChatColor.RED + "Die show bestaat al."); sender.sendMessage(ChatColor.RED + "Die show bestaat al.");
return false; return false;
} }
Shows.create(name); Shows.create(name);
p.sendMessage(ChatColor.GREEN + "De show " + ChatColor.WHITE + name + ChatColor.GREEN + " is aangemaakt!"); sender.sendMessage(ChatColor.GREEN + "De show " + ChatColor.WHITE + name + ChatColor.GREEN + " is aangemaakt!");
return true; return true;
} else if (args.length == 2 && args[0].equalsIgnoreCase("delete")) { } else if (args.length == 2 && args[0].equalsIgnoreCase("delete")) {
String name = args[1]; String name = args[1];
if (!Shows.exists(name)) { if (!Shows.exists(name)) {
p.sendMessage(ChatColor.RED + "Die show bestaat niet."); sender.sendMessage(ChatColor.RED + "Die show bestaat niet.");
return false; return false;
} }
Shows.delete(name); Shows.delete(name);
p.sendMessage(ChatColor.GREEN + "De show " + ChatColor.WHITE + name + ChatColor.GREEN + " is verwijderd!"); sender.sendMessage(ChatColor.GREEN + "De show " + ChatColor.WHITE + name + ChatColor.GREEN + " is verwijderd!");
return true; return true;
} else if (args.length >= 5 && args[0].equalsIgnoreCase("add")) { } else if (args.length >= 5 && args[0].equalsIgnoreCase("add")) {
String name = args[1]; String name = args[1];
if (!Shows.exists(name)) { if (!Shows.exists(name)) {
p.sendMessage(ChatColor.RED + "Die show bestaat niet."); sender.sendMessage(ChatColor.RED + "Die show bestaat niet.");
return false; return false;
} }
@ -74,37 +68,44 @@ public class ShowCMD implements CommandExecutor {
TriggerData data = MainUtil.parseData(builder.toString().trim()); TriggerData data = MainUtil.parseData(builder.toString().trim());
if (data == null) { if (data == null) {
p.sendMessage(ChatColor.RED + "Je hebt niet genoeg informatie meegeven voor de trigger."); sender.sendMessage(ChatColor.RED + "Je hebt niet genoeg informatie meegeven voor de trigger.");
return false; return false;
} }
Shows.addPoint(name, seconds, data); Shows.addPoint(name, seconds, data);
p.sendMessage(ChatColor.GREEN + "De show " + ChatColor.WHITE + name + ChatColor.GREEN + " bevat nu een extra punt!"); sender.sendMessage(ChatColor.GREEN + "De show " + ChatColor.WHITE + name + ChatColor.GREEN + " bevat nu een extra punt!");
return true; return true;
} else if (args.length == 2 && args[0].equalsIgnoreCase("start")) { } else if (args.length == 2 && args[0].equalsIgnoreCase("start")) {
String name = args[1]; String name = args[1];
if (!Shows.exists(name)) { if (!Shows.exists(name)) {
p.sendMessage(ChatColor.RED + "Die show bestaat niet."); sender.sendMessage(ChatColor.RED + "Die show bestaat niet.");
return false; return false;
} }
Shows.startShow(name); Shows.startShow(name);
p.sendMessage(ChatColor.GREEN + "De show " + ChatColor.WHITE + name + ChatColor.GREEN + " is gestart!"); sender.sendMessage(ChatColor.GREEN + "De show " + ChatColor.WHITE + name + ChatColor.GREEN + " is gestart!");
return true; return true;
} else if (args.length == 2 && args[0].equalsIgnoreCase("cancel")) { } else if (args.length == 2 && args[0].equalsIgnoreCase("cancel")) {
String name = args[1]; String name = args[1];
if (!Shows.exists(name)) { if (!Shows.exists(name)) {
p.sendMessage(ChatColor.RED + "Die show bestaat niet."); sender.sendMessage(ChatColor.RED + "Die show bestaat niet.");
return false; return false;
} }
Shows.cancelShow(name); Shows.cancelShow(name);
p.sendMessage(ChatColor.GREEN + "De show " + ChatColor.WHITE + name + ChatColor.GREEN + " is gestopt!"); sender.sendMessage(ChatColor.GREEN + "De show " + ChatColor.WHITE + name + ChatColor.GREEN + " is gestopt!");
return true; return true;
} else if (args.length == 2 && args[0].equalsIgnoreCase("gui")) { } else if (args.length == 2 && args[0].equalsIgnoreCase("gui")) {
if (!(sender instanceof Player)) {
sender.sendMessage(ChatColor.RED + "Je moet een speler zijn om dit te doen.");
return false;
}
Player p = (Player) sender;
String name = args[1]; String name = args[1];
if (!Shows.exists(name)) { if (!Shows.exists(name)) {
p.sendMessage(ChatColor.RED + "Die show bestaat niet."); p.sendMessage(ChatColor.RED + "Die show bestaat niet.");