From af47cb46b39ddac89c29a3cdaed5eba6f66fb7d0 Mon Sep 17 00:00:00 2001 From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com> Date: Sun, 17 Mar 2019 01:59:00 -0700 Subject: [PATCH] fix whois and add /delkit --- .../src/com/earth2me/essentials/Kits.java | 6 +++ .../src/com/earth2me/essentials/User.java | 2 +- .../essentials/commands/Commandcreatekit.java | 2 +- .../essentials/commands/Commanddelkit.java | 52 +++++++++++++++++++ .../essentials/commands/Commandwhois.java | 2 +- Essentials/src/plugin.yml | 12 +++++ 6 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 Essentials/src/com/earth2me/essentials/commands/Commanddelkit.java diff --git a/Essentials/src/com/earth2me/essentials/Kits.java b/Essentials/src/com/earth2me/essentials/Kits.java index 92b3f70e5..9f24b4c24 100644 --- a/Essentials/src/com/earth2me/essentials/Kits.java +++ b/Essentials/src/com/earth2me/essentials/Kits.java @@ -79,6 +79,12 @@ public class Kits implements IConf { config.save(); } + public void deleteKit(String name) { + config.removeProperty("kits." + name); + kits = _getKits(); + config.save(); + } + public String listKits(final net.ess3.api.IEssentials ess, final User user) throws Exception { try { final ConfigurationSection kits = config.getConfigurationSection("kits"); diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index f1e2d4911..33bcf09ef 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -778,7 +778,7 @@ public class User extends UserData implements Comparable, IMessageRecipien @Override public boolean isIgnoreExempt() { - return this.isAuthorized("essentials.chat.ignoreexempt"); + return false; } public boolean isRecipeSee() { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandcreatekit.java b/Essentials/src/com/earth2me/essentials/commands/Commandcreatekit.java index 5d6459087..1918d0540 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandcreatekit.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandcreatekit.java @@ -58,7 +58,7 @@ public class Commandcreatekit extends EssentialsCommand { // Command handler will auto fail if this fails. long delay = Long.valueOf(args[1]); - String kitname = args[0]; + String kitname = args[0].toLowerCase(); ItemStack[] items = user.getBase().getInventory().getContents(); List list = new ArrayList<>(); for (ItemStack is : items) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commanddelkit.java b/Essentials/src/com/earth2me/essentials/commands/Commanddelkit.java new file mode 100644 index 000000000..2d7747b68 --- /dev/null +++ b/Essentials/src/com/earth2me/essentials/commands/Commanddelkit.java @@ -0,0 +1,52 @@ +package com.earth2me.essentials.commands; + +import com.earth2me.essentials.CommandSource; +import com.earth2me.essentials.User; +import org.bukkit.ChatColor; +import org.bukkit.Server; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static com.earth2me.essentials.I18n.tl; + +public class Commanddelkit extends EssentialsCommand { + + public Commanddelkit() { + super("delkit"); + } + + // /delkit + @Override + public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception { + if (args.length != 1) { + throw new NotEnoughArgumentsException(); + } + + String name = String.join(" ", args).toLowerCase(); + + if (ess.getKits().getKits().getKeys(false).contains(name)) + { + ess.getKits().deleteKit(name); + user.sendMessage(ChatColor.GOLD + "Deleted kit " + ChatColor.RED + name + ChatColor.GOLD + "."); + } + else + { + throw new Exception(tl("kitNotFound")); + } + + } + + @Override + protected List getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) { + if (args.length == 1) { + try { + return new ArrayList<>(ess.getKits().getKits().getKeys(false)); + } catch (Exception e) { + return Collections.emptyList(); + } + } else { + return Collections.emptyList(); + } + } +} diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java index 267cbffd0..9c6f585ee 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandwhois.java @@ -46,7 +46,7 @@ public class Commandwhois extends EssentialsCommand { if (!ess.getSettings().isEcoDisabled()) { sender.sendMessage(tl("whoisMoney", NumberUtil.displayCurrency(user.getMoney(), ess))); } - if (!sender.isPlayer() || getTFMHandler().isAdmin(user)) { + if (!sender.isPlayer() || getTFMHandler().isAdmin(sender.getPlayer())) { sender.sendMessage(tl("whoisIPAddress", user.getBase().getAddress().getAddress().toString())); } final String location = user.getGeoLocation(); diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index c25f77697..e9e68f728 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -56,6 +56,10 @@ commands: description: Describes your current bearing. usage: / aliases: [ecompass,direction,edirection] + createkit: + description: Create a kit in game! + usage: / + aliases: [kitcreate,createk,kc,ck] customtext: description: Allows you to create custom text commands. usage: / - Define in bukkit.yml @@ -63,6 +67,10 @@ commands: description: Removes a home. usage: / [player:] aliases: [edelhome,remhome,eremhome,rmhome,ermhome] + delkit: + description: Delete a kit in game! + usage: / + aliases: [kitdelete,deletek,dc,dk,deletekit] delwarp: description: Deletes the specified warp. usage: / @@ -143,6 +151,10 @@ commands: description: Views a list of available commands. usage: / [search term] [page] aliases: [ehelp] + ignore: + description: Ignore or unignore other players. + usage: / + aliases: [eignore,unignore,eunignore,delignore,edelignore,remignore,eremignore,rmignore,ermignore] home: description: Teleport to your home. usage: / [player:][name]