Upstream/UltimateKits
1
0
Fork 0
mirror of https://github.com/songoda/UltimateKits.git synced 2024-11-08 19:51:36 +01:00
Code Issues Projects Releases Wiki Activity

Allow players to use the /kit <name>

Browse Source
This commit is contained in:
Brianna 2019-10-26 14:43:49 -04:00
parent 4f084fde6b
commit 7561e216af
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/songoda/ultimatekits/commands/CommandKit.java
View File

@ -5,7 +5,6 @@ import com.songoda.core.gui.GuiManager;
import com.songoda.ultimatekits.UltimateKits; import com.songoda.ultimatekits.UltimateKits;
import com.songoda.ultimatekits.gui.KitSelectorGui; import com.songoda.ultimatekits.gui.KitSelectorGui;
import com.songoda.ultimatekits.kit.Kit; import com.songoda.ultimatekits.kit.Kit;
import com.songoda.ultimatekits.utils.Methods;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -33,11 +32,6 @@ public class CommandKit extends AbstractCommand {
return ReturnType.SUCCESS; return ReturnType.SUCCESS;
} }
if (!sender.hasPermission("ultimatekits.admin")) {
instance.getLocale().getMessage("command.general.noperms").sendPrefixedMessage(sender);
return ReturnType.FAILURE;
}
if (instance.getKitManager().getKit(args[0]) == null) { if (instance.getKitManager().getKit(args[0]) == null) {
instance.getLocale().getMessage("command.kit.kitdoesntexist").sendPrefixedMessage(sender); instance.getLocale().getMessage("command.kit.kitdoesntexist").sendPrefixedMessage(sender);
return ReturnType.FAILURE; return ReturnType.FAILURE;
@ -47,16 +41,19 @@ public class CommandKit extends AbstractCommand {
if (args.length == 1) { if (args.length == 1) {
// /kit <kit> - Gives kit to self. // /kit <kit> - Gives kit to self.
if (!(sender instanceof Player)) { if (!(sender instanceof Player))
instance.getLocale().newMessage("&cYou must be a player to use this command!").sendMessage(sender); return ReturnType.NEEDS_PLAYER;
return ReturnType.FAILURE;
}
kit.giveKit((Player) sender); kit.processGenericUse((Player) sender, false);
return ReturnType.SUCCESS; return ReturnType.SUCCESS;
} else if (args.length == 2) { } else if (args.length == 2) {
// /kit <kit> <player> - Gives kit to another player. // /kit <kit> <player> - Gives kit to another player.
if (!sender.hasPermission("ultimatekits.admin")) {
instance.getLocale().getMessage("command.general.noperms").sendPrefixedMessage(sender);
return ReturnType.FAILURE;
}
if (!args[1].equalsIgnoreCase("all") && Bukkit.getPlayer(args[1]) == null) { if (!args[1].equalsIgnoreCase("all") && Bukkit.getPlayer(args[1]) == null) {
instance.getLocale().newMessage("&cThat username does not exist, or the user is offline!").sendPrefixedMessage(sender); instance.getLocale().newMessage("&cThat username does not exist, or the user is offline!").sendPrefixedMessage(sender);
return ReturnType.FAILURE; return ReturnType.FAILURE;
@ -66,13 +63,13 @@ public class CommandKit extends AbstractCommand {
String who = player != null ? player.getName() : "everyone"; String who = player != null ? player.getName() : "everyone";
if (player != null) { if (player != null) {
kit.giveKit(player); kit.processGenericUse(player, true);
instance.getLocale().getMessage("event.claim.givesuccess") instance.getLocale().getMessage("event.claim.givesuccess")
.processPlaceholder("kit", kit.getShowableName()) .processPlaceholder("kit", kit.getShowableName())
.sendPrefixedMessage(sender); .sendPrefixedMessage(sender);
} else { } else {
Bukkit.getOnlinePlayers().forEach(onlinePlayer -> { Bukkit.getOnlinePlayers().forEach(onlinePlayer -> {
kit.giveKit(onlinePlayer); kit.processGenericUse(onlinePlayer, true);
instance.getLocale().getMessage("event.claim.givesuccess") instance.getLocale().getMessage("event.claim.givesuccess")
.processPlaceholder("kit", kit.getShowableName()) .processPlaceholder("kit", kit.getShowableName())
.sendPrefixedMessage(sender); .sendPrefixedMessage(sender);