TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-06-30 09:49:27 +00:00
Code Issues Projects Releases Wiki Activity

Match kit name in delkit (#3396)

Browse source 
This allows deleting kits ignoring case; fixes #3370.

I don't know if this is the ideal fix, but everything else for kits seems to nuke the letter casing. Not really sure why in `Kits.java`, the keys needs to get lowercased in a new mock `ConfigurationSection`. It just seems like this would purely make it harder to access the same section again in the real config. Instead, I just added a different method that matches the real config name of the kit (as set in `/createkit`, which currently allows uppercase).
This commit is contained in:
pop4959 2020-07-01 14:12:43 -07:00 committed by GitHub
parent d743f928ad
commit 9c487b0aac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Essentials/src/com/earth2me/essentials/Kits.java
View file

@ -70,6 +70,21 @@ public class Kits implements IConf {
return null;
}
// Tries to find an existing kit name that matches the given name, ignoring case. Returns null if no match.
public String matchKit(String name) {
if (config.isConfigurationSection("kits")) {
final ConfigurationSection section = config.getConfigurationSection("kits");
if (section != null) {
for (String kitName : section.getKeys(false)) {
if (kitName.equalsIgnoreCase(name)) {
return kitName;
}
}
}
}
return null;
}
public void addKit(String name, List<String> lines, long delay) {
// Will overwrite but w/e
config.set("kits." + name + ".delay", delay);

2
Essentials/src/com/earth2me/essentials/commands/Commanddelkit.java
View file

@ -23,7 +23,7 @@ public class Commanddelkit extends EssentialsCommand {
sender.sendMessage(kitList.length() > 0 ? tl("kits", kitList) : tl("noKits"));
throw new NoChargeException();
} else {
final String kitName = args[0];
final String kitName = ess.getKits().matchKit(args[0]);
final Kit kit = new Kit(kitName, ess);
if (sender.getPlayer() != null) {