mirror/Essentials
2
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-27 01:40:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some tab completes that I missed

Browse Source
This commit is contained in:
JRoy 2020-08-30 12:06:39 -04:00 committed by md678685
parent 4d2fbd04c5
commit 1671d4839c
12 changed files with 21 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/CommandSource.java
View File

@ -51,4 +51,8 @@ public class CommandSource {
public String getSelfSelector() {
return sender instanceof Player ? getPlayer().getName() : "*";
}
public String getDisplayName() {
return sender instanceof Player ? getPlayer().getDisplayName() : getSender().getName();
}
}

11
Essentials/src/com/earth2me/essentials/commands/Commandafk.java
View File

@ -90,18 +90,9 @@ public class Commandafk extends EssentialsCommand {
user.setDisplayNick(); // Set this again after toggling
}
@Override
protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
if (args.length == 1 && user.isAuthorized("essentials.afk.others")) {
return getPlayers(server, user);
} else {
return Collections.emptyList();
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
if (args.length == 1) {
if (args.length == 1 && sender.isAuthorized("essentials.afk.others", ess)) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();

11
Essentials/src/com/earth2me/essentials/commands/Commandbalance.java
View File

@ -38,18 +38,9 @@ public class Commandbalance extends EssentialsCommand {
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
if (args.length == 1 && user.isAuthorized("essentials.balance.others")) {
return getPlayers(server, user);
} else {
return Collections.emptyList();
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
if (args.length == 1) {
if (args.length == 1 && sender.isAuthorized("essentials.balance.others", ess)) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();

6
Essentials/src/com/earth2me/essentials/commands/Commandban.java
View File

@ -37,10 +37,8 @@ public class Commandban extends EssentialsCommand {
if (sender.isPlayer() && !ess.getUser(sender.getPlayer()).isAuthorized("essentials.ban.offline")) {
throw new Exception(tl("banExemptOffline"));
}
} else {
if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer()) {
throw new Exception(tl("banExempt"));
}
} else if (user.isAuthorized("essentials.ban.exempt") && sender.isPlayer()) {
throw new Exception(tl("banExempt"));
}
final String senderName = sender.isPlayer() ? sender.getPlayer().getDisplayName() : Console.NAME;

12
Essentials/src/com/earth2me/essentials/commands/Commandbroadcast.java
View File

@ -1,7 +1,6 @@
package com.earth2me.essentials.commands;
import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.User;
import com.earth2me.essentials.utils.FormatUtil;
import org.bukkit.Server;
@ -13,21 +12,12 @@ public class Commandbroadcast extends EssentialsCommand {
super("broadcast");
}
@Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
sendBroadcast(user.getDisplayName(), args);
}
@Override
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
sendBroadcast(sender.getSender().getName(), args);
}
private void sendBroadcast(final String name, final String[] args) throws NotEnoughArgumentsException {
if (args.length < 1) {
throw new NotEnoughArgumentsException();
}
ess.broadcastMessage(tl("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), name));
ess.broadcastMessage(tl("broadcast", FormatUtil.replaceFormat(getFinalArg(args, 0)).replace("\\n", "\n"), sender.getDisplayName()));
}
}

15
Essentials/src/com/earth2me/essentials/commands/Commandbroadcastworld.java
View File

@ -78,22 +78,9 @@ public class Commandbroadcastworld extends EssentialsCommand {
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
if (args.length == 1 && ess.getSettings().isAllowWorldInBroadcastworld()) {
List<String> worlds = Lists.newArrayList();
for (World world : server.getWorlds()) {
worlds.add(world.getName());
}
return worlds;
} else {
return Collections.emptyList();
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
if (args.length == 1) {
if (args.length == 1 && (!sender.isPlayer() || ess.getSettings().isAllowWorldInBroadcastworld())) {
List<String> worlds = Lists.newArrayList();
for (World world : server.getWorlds()) {
worlds.add(world.getName());

7
Essentials/src/com/earth2me/essentials/commands/Commanddelhome.java
View File

@ -1,6 +1,7 @@
package com.earth2me.essentials.commands;
import com.earth2me.essentials.CommandSource;
import com.earth2me.essentials.IUser;
import com.earth2me.essentials.User;
import org.bukkit.Server;
@ -54,10 +55,10 @@ public class Commanddelhome extends EssentialsCommand {
@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");
IUser user = sender.getUser(ess);
boolean canDelOthers = sender.isAuthorized("essentials.delhome.others", ess);
if (args.length == 1) {
List<String> homes = user == null ? new ArrayList<>() : user.getHomes();
List<String> homes = sender.isPlayer() ? new ArrayList<>() : user.getHomes();
if (canDelOthers) {
int sepIndex = args[0].indexOf(':');
if (sepIndex < 0) {

11
Essentials/src/com/earth2me/essentials/commands/Commandfeed.java
View File

@ -65,18 +65,9 @@ public class Commandfeed extends EssentialsLoopCommand {
player.setExhaustion(0F);
}
@Override
protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
if (args.length == 1 && user.isAuthorized("essentials.feed.others")) {
return getPlayers(server, user);
} else {
return Collections.emptyList();
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
if (args.length == 1) {
if (args.length == 1 && sender.isAuthorized("essentials.feed.others", ess)) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();

11
Essentials/src/com/earth2me/essentials/commands/Commandgetpos.java
View File

@ -47,18 +47,9 @@ public class Commandgetpos extends EssentialsCommand {
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
if (args.length == 1 && user.isAuthorized("essentials.getpos.others")) {
return getPlayers(server, user);
} else {
return Collections.emptyList();
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
if (args.length == 1) {
if (args.length == 1 && sender.isAuthorized("essentials.getpos.others", ess)) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();

12
Essentials/src/com/earth2me/essentials/commands/Commandheal.java
View File

@ -78,21 +78,13 @@ public class Commandheal extends EssentialsLoopCommand {
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, User user, String commandLabel, String[] args) {
if (args.length == 1 && user.isAuthorized("essentials.heal.others")) {
return getPlayers(server, user);
} else {
return Collections.emptyList();
}
}
@Override
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
if (args.length == 1) {
if (args.length == 1 && sender.isAuthorized("essentials.heal.others", ess)) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();
}
}
}

3
Essentials/src/com/earth2me/essentials/commands/Commandme.java
View File

@ -10,6 +10,7 @@ import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.Player;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -101,6 +102,6 @@ public class Commandme extends EssentialsCommand {
@Override
protected List<String> getTabCompleteOptions(Server server, CommandSource sender, String commandLabel, String[] args) {
return null; // It's a chat message, use the default chat handler
return Collections.emptyList();
}
}

11
Essentials/src/com/earth2me/essentials/commands/Commandnick.java
View File

@ -122,18 +122,9 @@ public class Commandnick extends EssentialsLoopCommand {
}
}
@Override
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
if (args.length == 1 && user.isAuthorized("essentials.nick.others")) {
return getPlayers(server, user);
} else {
return Collections.emptyList();
}
}
@Override
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
if (args.length == 1) {
if (args.length == 1 && sender.isAuthorized("essentials.nick.others", ess)) {
return getPlayers(server, sender);
} else {
return Collections.emptyList();