diff --git a/build.gradle b/build.gradle index 5a6cc71..6c948de 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'xyz.tronax' -version = '1.2' +version = '1.3' compileJava.options.encoding = "UTF-8" compileTestJava.options.encoding = "UTF-8" diff --git a/src/main/java/xyz/tronax/repairall/commands/CMD_repairall.java b/src/main/java/xyz/tronax/repairall/commands/CMD_repairall.java index 8cf7e21..7aec411 100644 --- a/src/main/java/xyz/tronax/repairall/commands/CMD_repairall.java +++ b/src/main/java/xyz/tronax/repairall/commands/CMD_repairall.java @@ -14,7 +14,41 @@ public class CMD_repairall implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { if(!(sender instanceof Player)) { - sender.sendMessage(RepairAll.prefix + "§cYou are not a player!"); + if(args.length == 0) { + sender.sendMessage(RepairAll.prefix + "§cYou are not a player! Please provide a player name!"); + } else if(args.length == 1) { + Player t = Bukkit.getPlayer(args[0]); + if(t == null) { + sender.sendMessage(RepairAll.prefix + "§4" + args[0] + " §cis not online!"); + } else { + Player p = (Player) sender; + ItemStack[] items = t.getInventory().getContents(); + ItemStack[] armor = t.getInventory().getArmorContents(); + for(int i = 0; i < items.length; i++) { + ItemStack e = items[i]; + if(e != null) { + ItemMeta me = e.getItemMeta(); + Damageable mee = (Damageable) me; + mee.setDamage(0); + e.setItemMeta(mee); + }else{} + } + for(int i = 0; i < armor.length; i++) { + ItemStack a = armor[i]; + if(a != null) { + ItemMeta ae = a.getItemMeta(); + Damageable aee = (Damageable) ae; + aee.setDamage(0); + a.setItemMeta(aee); + } else {} + } + p.sendMessage(RepairAll.prefix + "§aThe items of §e" + t.getName() + " §ahave been repaired!"); + Bukkit.getConsoleSender().sendMessage(RepairAll.prefix + "§4" + p.getName().toString() + " §arepaired the items of §e" + t.getName()); + t.sendMessage(RepairAll.prefix + "§aYour items were repaired!"); + } + } else { + sender.sendMessage(RepairAll.prefix + "§cToo many arguments!"); + } } else { if(args.length == 0) { Player p = (Player) sender; @@ -41,9 +75,9 @@ public class CMD_repairall implements CommandExecutor { p.sendMessage(RepairAll.prefix + "§aYour items were repaired!"); Bukkit.getConsoleSender().sendMessage(RepairAll.prefix + "§4" + p.getName().toString() + " §ahas repaired all his items!"); } else if(args.length == 1) { - Player t = Bukkit.getPlayer(args[1]); + Player t = Bukkit.getPlayer(args[0]); if(t == null) { - sender.sendMessage(RepairAll.prefix + "§4" + t.getName() + " §cis not online!"); + sender.sendMessage(RepairAll.prefix + "§4" + args[0] + " §cis not online!"); } else { Player p = (Player) sender; ItemStack[] items = t.getInventory().getContents(); @@ -66,9 +100,9 @@ public class CMD_repairall implements CommandExecutor { a.setItemMeta(aee); } else {} } - p.sendMessage(RepairAll.prefix + "§aThe items of §e" + t.getName() + " §agot repaired!"); - Bukkit.getConsoleSender().sendMessage(RepairAll.prefix + "§4" + p.getName().toString() + " §arepaired the items of §e" + t.getName() + " §a!"); - t.sendMessage(RepairAll.prefix + " §aYour items were repaired!"); + p.sendMessage(RepairAll.prefix + "§aThe items of §e" + t.getName() + " §ahave been repaired!"); + Bukkit.getConsoleSender().sendMessage(RepairAll.prefix + "§4" + p.getName().toString() + " §arepaired the items of §e" + t.getName()); + t.sendMessage(RepairAll.prefix + "§aYour items were repaired!"); } } else { sender.sendMessage(RepairAll.prefix + "§cToo many arguments!"); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 1c04b1f..d13c61d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -10,7 +10,6 @@ commands: description: Repairs all of your items! permission: repairall.repair permission-message: '§cRepair§7All §8| §cYou are not allowed to do this!' - usage: /repairall aliases: - ra - repall