Don't perform /f who for players without a faction

This commit is contained in:
eueln 2014-12-29 22:02:18 -06:00
parent 190c2d793f
commit c4c5bd9df9
2 changed files with 6 additions and 0 deletions

View File

@ -42,6 +42,11 @@ public class CmdShow extends FCommand {
} }
} }
if (faction.isNone()) {
msg(TL.COMMAND_SHOW_NOFACTION);
return;
}
// if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
if (!payForCommand(Conf.econCostShow, TL.COMMAND_SHOW_TOSHOW, TL.COMMAND_SHOW_FORSHOW)) { if (!payForCommand(Conf.econCostShow, TL.COMMAND_SHOW_TOSHOW, TL.COMMAND_SHOW_FORSHOW)) {
return; return;

View File

@ -343,6 +343,7 @@ public enum TL {
COMMAND_SETHOME_SET("%s<i> set the home for your faction. You can now use:"), COMMAND_SETHOME_SET("%s<i> set the home for your faction. You can now use:"),
COMMAND_SETHOME_SETOTHER("<b>You have set the home for the %s<i> faction."), COMMAND_SETHOME_SETOTHER("<b>You have set the home for the %s<i> faction."),
COMMAND_SHOW_NOFACTION("You are not in a faction"),
COMMAND_SHOW_TOSHOW("to show faction information"), COMMAND_SHOW_TOSHOW("to show faction information"),
COMMAND_SHOW_FORSHOW("for showing faction information"), COMMAND_SHOW_FORSHOW("for showing faction information"),
COMMAND_SHOW_DESCRIPTION("<a>Description: <i>%s"), COMMAND_SHOW_DESCRIPTION("<a>Description: <i>%s"),