Chikachi
/
DiscordIntegration
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix - Linking commands are now always added

master
Mijago 2018-06-01 22:01:45 +02:00 committed by Chikachi
parent b95275bfec
commit 63bca4d64a
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/chikachi/discord/command/CommandDiscord.java
View File

@ -35,11 +35,8 @@ public class CommandDiscord extends CommandTreeBase {
this.addSubcommand(new SubCommandTps());
this.addSubcommand(new SubCommandUnstuck());
this.addSubcommand(new SubCommandUptime());
if (Configuration.getConfig().discord.allowLinking) {
this.addSubcommand(new SubCommandLink());
this.addSubcommand(new SubCommandUnlink());
}
this.addSubcommand(new SubCommandLink());
this.addSubcommand(new SubCommandUnlink());
}
@Override
@ -52,16 +49,6 @@ public class CommandDiscord extends CommandTreeBase {
return "/discord <config|online" + (Configuration.getConfig().discord.allowLinking ? "|link|unlink" : "") + "|tps|unstuck|uptime> [options]";
}
@Override
public List<String> getAliases() {
return new ArrayList<>();
}
@Override
public boolean checkPermission(MinecraftServer server, ICommandSender sender) {
return sender.canUseCommand(4, getName());
}
@Override
public boolean isUsernameIndex(String[] args, int index) {
return args.length > 1 && args[0].equalsIgnoreCase("unstuck") && index == 1;

5
src/main/java/chikachi/discord/command/SubCommandLink.java
View File

@ -46,6 +46,11 @@ class SubCommandLink extends CommandBase {
@Override
public void execute(MinecraftServer server, ICommandSender sender, String[] strings) throws CommandException {
if (!Configuration.getConfig().discord.allowLinking) {
sender.sendMessage(new TextComponentString(MinecraftFormattingCodes.DARK_RED + "Linking is disabled on this server."));
return;
}
if (!(sender instanceof EntityPlayer)) {
sender.sendMessage(new TextComponentString(MinecraftFormattingCodes.DARK_RED + "You need to be a player"));
return;

5
src/main/java/chikachi/discord/command/SubCommandUnlink.java
View File

@ -42,6 +42,11 @@ class SubCommandUnlink extends CommandBase {
@Override
public void execute(MinecraftServer server, ICommandSender sender, String[] strings) throws CommandException {
if (!Configuration.getConfig().discord.allowLinking) {
sender.sendMessage(new TextComponentString(MinecraftFormattingCodes.DARK_RED + "Linking is disabled on this server."));
return;
}
if (!(sender instanceof EntityPlayer)) {
sender.sendMessage(new TextComponentString(MinecraftFormattingCodes.DARK_RED + "You need to be a player"));
return;