mirror of
https://github.com/TotalFreedomMC/TF-ProjectKorra.git
synced 2024-12-23 00:15:05 +00:00
Fixed & cleaned RemoveCommand
This commit is contained in:
Matt
parent
fe675fbfd9
commit
5797d7dc25
1 changed files with 61 additions and 38 deletions
|
|
@ -24,16 +24,22 @@ import java.util.List;
|
|||
public class RemoveCommand extends PKCommand {
|
||||
|
||||
private String succesfullyRemovedElementSelf, wrongElementSelf, invalidElement, playerOffline, wrongElementTarget,
|
||||
succesfullyRemovedElementTarget, succesfullyRemovedElementTargetConfirm, succesfullyRemovedAllElementsTarget, succesfullyRemovedAllElementsTargetConfirm;
|
||||
succesfullyRemovedElementTarget, succesfullyRemovedElementTargetConfirm, succesfullyRemovedAllElementsTarget,
|
||||
succesfullyRemovedAllElementsTargetConfirm;
|
||||
|
||||
public RemoveCommand() {
|
||||
super("remove", "/bending remove <Player> [Element]", ConfigManager.languageConfig.get().getString("Commands.Remove.Description"), new String[] { "remove", "rm" });
|
||||
super("remove", "/bending remove <Player> [Element]",
|
||||
ConfigManager.languageConfig.get().getString("Commands.Remove.Description"), new String[] { "remove", "rm" });
|
||||
|
||||
this.succesfullyRemovedElementSelf = ConfigManager.languageConfig.get().getString("Commands.Remove.RemovedElement");
|
||||
this.succesfullyRemovedAllElementsTarget = ConfigManager.languageConfig.get().getString("Commands.Remove.Other.RemovedAllElements");
|
||||
this.succesfullyRemovedAllElementsTargetConfirm = ConfigManager.languageConfig.get().getString("Commands.Remove.Other.RemovedAllElementsConfirm");
|
||||
this.succesfullyRemovedElementTarget = ConfigManager.languageConfig.get().getString("Commands.Remove.Other.RemovedElement");
|
||||
this.succesfullyRemovedElementTargetConfirm = ConfigManager.languageConfig.get().getString("Commands.Remove.Other.RemovedElementConfirm");
|
||||
this.succesfullyRemovedAllElementsTarget = ConfigManager.languageConfig.get()
|
||||
.getString("Commands.Remove.Other.RemovedAllElements");
|
||||
this.succesfullyRemovedAllElementsTargetConfirm = ConfigManager.languageConfig.get()
|
||||
.getString("Commands.Remove.Other.RemovedAllElementsConfirm");
|
||||
this.succesfullyRemovedElementTarget = ConfigManager.languageConfig.get()
|
||||
.getString("Commands.Remove.Other.RemovedElement");
|
||||
this.succesfullyRemovedElementTargetConfirm = ConfigManager.languageConfig.get()
|
||||
.getString("Commands.Remove.Other.RemovedElementConfirm");
|
||||
this.invalidElement = ConfigManager.languageConfig.get().getString("Commands.Remove.InvalidElement");
|
||||
this.wrongElementSelf = ConfigManager.languageConfig.get().getString("Commands.Remove.WrongElement");
|
||||
this.wrongElementTarget = ConfigManager.languageConfig.get().getString("Commands.Remove.Other.WrongElement");
|
||||
|
|
@ -58,25 +64,34 @@ public class RemoveCommand extends PKCommand {
|
|||
senderBPlayer.getSubElements().remove(e);
|
||||
GeneralMethods.saveSubElements(senderBPlayer);
|
||||
GeneralMethods.removeUnusableAbilities(sender.getName());
|
||||
sender.sendMessage(e.getColor() + this.succesfullyRemovedElementSelf.replace("{element}" , e.getName() + e.getType().getBending()).replace("{sender}", ChatColor.DARK_AQUA + sender.getName() + e.getColor()));
|
||||
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeSubElementEvent(sender, player, (SubElement) e, com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent.Result.REMOVE));
|
||||
} else sender.sendMessage(ChatColor.RED + invalidElement);
|
||||
sender.sendMessage(e.getColor() + this.succesfullyRemovedElementSelf
|
||||
.replace("{element}", e.getName() + e.getType().getBending())
|
||||
.replace("{sender}", ChatColor.DARK_AQUA + sender.getName() + e.getColor()));
|
||||
Bukkit.getServer().getPluginManager()
|
||||
.callEvent(new PlayerChangeSubElementEvent(sender, player, (SubElement) e,
|
||||
com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent.Result.REMOVE));
|
||||
} else
|
||||
sender.sendMessage(ChatColor.RED + wrongElementSelf);
|
||||
return;
|
||||
}
|
||||
if (senderBPlayer.hasElement(e)) {
|
||||
senderBPlayer.getElements().remove(e);
|
||||
GeneralMethods.saveElements(senderBPlayer);
|
||||
GeneralMethods.removeUnusableAbilities(sender.getName());
|
||||
} else if (e instanceof Element) {
|
||||
if (senderBPlayer.hasElement(e)) {
|
||||
senderBPlayer.getElements().remove(e);
|
||||
GeneralMethods.saveElements(senderBPlayer);
|
||||
GeneralMethods.removeUnusableAbilities(sender.getName());
|
||||
|
||||
sender.sendMessage(e.getColor() + succesfullyRemovedElementSelf.replace("{element}", e.getName()));
|
||||
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, (Player) sender, e, Result.REMOVE));
|
||||
return;
|
||||
} else {
|
||||
sender.sendMessage(ChatColor.RED + wrongElementSelf);
|
||||
return;
|
||||
sender.sendMessage(e.getColor() + succesfullyRemovedElementSelf.replace("{element}", e.getName()));
|
||||
Bukkit.getServer().getPluginManager()
|
||||
.callEvent(new PlayerChangeElementEvent(sender, (Player) sender, e, Result.REMOVE));
|
||||
return;
|
||||
} else
|
||||
sender.sendMessage(ChatColor.RED + wrongElementSelf);
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
} else
|
||||
sender.sendMessage(ChatColor.RED + invalidElement);
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -105,8 +120,12 @@ public class RemoveCommand extends PKCommand {
|
|||
}
|
||||
|
||||
GeneralMethods.removeUnusableAbilities(player.getName());
|
||||
player.sendMessage(e.getColor() + this.succesfullyRemovedElementTargetConfirm.replace("{element}", e.getName() + e.getType().getBending()).replace("{sender}", ChatColor.DARK_AQUA + player.getName() + e.getColor()));
|
||||
sender.sendMessage(e.getColor() + this.succesfullyRemovedElementTarget.replace("{element}" , e.getName() + e.getType().getBending()).replace("{sender}", ChatColor.DARK_AQUA + sender.getName() + e.getColor()));
|
||||
player.sendMessage(e.getColor()
|
||||
+ this.succesfullyRemovedElementTargetConfirm.replace("{element}", e.getName() + e.getType().getBending())
|
||||
.replace("{sender}", ChatColor.DARK_AQUA + player.getName() + e.getColor()));
|
||||
sender.sendMessage(e.getColor()
|
||||
+ this.succesfullyRemovedElementTarget.replace("{element}", e.getName() + e.getType().getBending())
|
||||
.replace("{sender}", ChatColor.DARK_AQUA + sender.getName() + e.getColor()));
|
||||
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, player, e, Result.REMOVE));
|
||||
return;
|
||||
}
|
||||
|
|
@ -116,16 +135,19 @@ public class RemoveCommand extends PKCommand {
|
|||
GeneralMethods.saveElements(bPlayer);
|
||||
GeneralMethods.saveSubElements(bPlayer);
|
||||
GeneralMethods.removeUnusableAbilities(player.getName());
|
||||
if (GeneralMethods.hasRPG()) RPGMethods.revokeAvatar(bPlayer.getUUID());
|
||||
sender.sendMessage(ChatColor.YELLOW + this.succesfullyRemovedAllElementsTargetConfirm.replace("{target}", ChatColor.DARK_AQUA + player.getName() + ChatColor.YELLOW));
|
||||
player.sendMessage(ChatColor.YELLOW + this.succesfullyRemovedAllElementsTarget.replace("{sender}", ChatColor.DARK_AQUA + sender.getName() + ChatColor.YELLOW));
|
||||
if (GeneralMethods.hasRPG())
|
||||
RPGMethods.revokeAvatar(bPlayer.getUUID());
|
||||
sender.sendMessage(ChatColor.YELLOW + this.succesfullyRemovedAllElementsTargetConfirm.replace("{target}",
|
||||
ChatColor.DARK_AQUA + player.getName() + ChatColor.YELLOW));
|
||||
player.sendMessage(ChatColor.YELLOW + this.succesfullyRemovedAllElementsTarget.replace("{sender}",
|
||||
ChatColor.DARK_AQUA + sender.getName() + ChatColor.YELLOW));
|
||||
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, player, null, Result.REMOVE));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks if the CommandSender has the permission 'bending.admin.remove'. If
|
||||
* not, it tells them they don't have permission to use the command.
|
||||
* Checks if the CommandSender has the permission 'bending.admin.remove'. If not, it tells them
|
||||
* they don't have permission to use the command.
|
||||
*
|
||||
* @return True if they have the permission, false otherwise
|
||||
*/
|
||||
|
|
@ -140,7 +162,8 @@ public class RemoveCommand extends PKCommand {
|
|||
|
||||
@Override
|
||||
protected List<String> getTabCompletion(CommandSender sender, List<String> args) {
|
||||
if (args.size() >= 2 || !sender.hasPermission("bending.command.remove")) return new ArrayList<String>();
|
||||
if (args.size() >= 2 || !sender.hasPermission("bending.command.remove"))
|
||||
return new ArrayList<String>();
|
||||
List<String> l = new ArrayList<String>();
|
||||
if (args.size() == 0) {
|
||||
for (Player p : Bukkit.getOnlinePlayers()) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue