mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-09-29 13:25:30 +00:00
d5ffed09b4
Fixes #1337 😎 This PR fixes tab completions for all of the home commands in Essentials. Prior to this PR, the behavior is approximately as follows: - `/sethome` has no implementation for completions, and so it provides player names, which isn't very useful, and in my opinion can cause more harm than good by confusing users. - `/home` and `/delhome` fail to provide valid completions when a user has the `essentials.home.others` permission. The argument syntax is `[player:]<name>` but it tries to complete it as `<player> <name>`. Not only does it not show you suggestions for your own homes, but it proceeds to show you invalid suggestions! This PR provides completions that accurately reflect the syntax and real behavior of the command, including suggesting homes for player names that are partially matched. It will provide suggestions for all of your own homes, as well as providing suggestions based on how far along you are in the command (players if you haven't specified `:` yet, otherwise a specific player's homes).
82 lines
2.8 KiB
Java
82 lines
2.8 KiB
Java
package com.earth2me.essentials.commands;
|
|
|
|
import com.earth2me.essentials.CommandSource;
|
|
import com.earth2me.essentials.User;
|
|
import org.bukkit.Server;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.Collections;
|
|
import java.util.List;
|
|
import java.util.Locale;
|
|
|
|
import static com.earth2me.essentials.I18n.tl;
|
|
|
|
|
|
public class Commanddelhome extends EssentialsCommand {
|
|
public Commanddelhome() {
|
|
super("delhome");
|
|
}
|
|
|
|
@Override
|
|
public void run(final Server server, final CommandSource sender, final String commandLabel, String[] args) throws Exception {
|
|
if (args.length < 1) {
|
|
throw new NotEnoughArgumentsException();
|
|
}
|
|
|
|
User user = ess.getUser(sender.getPlayer());
|
|
String name;
|
|
String[] expandedArg;
|
|
|
|
//Allowing both formats /sethome khobbits house | /sethome khobbits:house
|
|
final String[] nameParts = args[0].split(":");
|
|
if (nameParts[0].length() != args[0].length()) {
|
|
expandedArg = nameParts;
|
|
} else {
|
|
expandedArg = args;
|
|
}
|
|
|
|
if (expandedArg.length > 1 && (user == null || user.isAuthorized("essentials.delhome.others"))) {
|
|
user = getPlayer(server, expandedArg, 0, true, true);
|
|
name = expandedArg[1];
|
|
} else if (user == null) {
|
|
throw new NotEnoughArgumentsException();
|
|
} else {
|
|
name = expandedArg[0];
|
|
}
|
|
|
|
if (name.equalsIgnoreCase("bed")) {
|
|
throw new Exception(tl("invalidHomeName"));
|
|
}
|
|
|
|
user.delHome(name.toLowerCase(Locale.ENGLISH));
|
|
sender.sendMessage(tl("deleteHome", name));
|
|
}
|
|
|
|
@Override
|
|
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
|
|
User user = ess.getUser(sender.getPlayer());
|
|
boolean canDelOthers = user == null || user.isAuthorized("essentials.delhome.others");
|
|
if (args.length == 1) {
|
|
List<String> homes = user == null ? new ArrayList<>() : user.getHomes();
|
|
if (canDelOthers) {
|
|
int sepIndex = args[0].indexOf(':');
|
|
if (sepIndex < 0) {
|
|
getPlayers(server, sender).forEach(player -> homes.add(player + ":"));
|
|
} else {
|
|
String namePart = args[0].substring(0, sepIndex);
|
|
User otherUser;
|
|
try {
|
|
otherUser = getPlayer(server, new String[]{namePart}, 0, true, true);
|
|
} catch (Exception ex) {
|
|
return homes;
|
|
}
|
|
otherUser.getHomes().forEach(home -> homes.add(namePart + ":" + home));
|
|
}
|
|
}
|
|
return homes;
|
|
} else {
|
|
return Collections.emptyList();
|
|
}
|
|
}
|
|
}
|