Add faction exemption to /f show

This commit is contained in:
Kakifrucht 2016-12-17 00:16:42 +01:00
parent a255114808
commit 04dd47dfea
4 changed files with 15 additions and 0 deletions

View File

@ -54,6 +54,12 @@ public class CmdShow extends FCommand {
return; return;
} }
if (!fme.getPlayer().hasPermission("factions.show.bypassexempt")
&& P.p.getConfig().getStringList("show-exempt").contains(faction.getTag())) {
msg(TL.COMMAND_SHOW_EXEMPT);
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

@ -463,6 +463,7 @@ public enum TL {
COMMAND_SHOW_MEMBERSOFFLINE("Members offline: "), COMMAND_SHOW_MEMBERSOFFLINE("Members offline: "),
COMMAND_SHOW_COMMANDDESCRIPTION("Show faction information"), COMMAND_SHOW_COMMANDDESCRIPTION("Show faction information"),
COMMAND_SHOW_DEATHS_TIL_RAIDABLE("<i>DTR: %1$d"), COMMAND_SHOW_DEATHS_TIL_RAIDABLE("<i>DTR: %1$d"),
COMMAND_SHOW_EXEMPT("<b>This faction is exempt and cannot be seen."),
COMMAND_SHOWINVITES_PENDING("Players with pending invites: "), COMMAND_SHOWINVITES_PENDING("Players with pending invites: "),
COMMAND_SHOWINVITES_CLICKTOREVOKE("Click to revoke invite for %1$s"), COMMAND_SHOWINVITES_CLICKTOREVOKE("Click to revoke invite for %1$s"),

View File

@ -245,6 +245,11 @@ show:
# For a /f show that does not display fancy messages that are essentially empty, use minimal-show # For a /f show that does not display fancy messages that are essentially empty, use minimal-show
minimal-show: false minimal-show: false
# Factions that should be exempt from /f show, case sensitive, useful for a
# serverteam faction, since the command shows vanished players otherwise
show-exempt:
- Put_faction_tag_here
############################################################ ############################################################
# +------------------------------------------------------+ # # +------------------------------------------------------+ #
# | Configurable /f list | # # | Configurable /f list | #

View File

@ -48,6 +48,7 @@ permissions:
factions.kick.any: true factions.kick.any: true
factions.ownershipbypass: true factions.ownershipbypass: true
factions.chatspy: true factions.chatspy: true
factions.show.bypassexempt: true
factions.kit.fullplayer: factions.kit.fullplayer:
default: true default: true
description: Can also create new factions. description: Can also create new factions.
@ -231,6 +232,8 @@ permissions:
description: set faction home for another faction description: set faction home for another faction
factions.show: factions.show:
description: show faction information description: show faction information
factions.show.bypassexempt:
description: show exempt faction information
factions.tag: factions.tag:
description: change the faction tag description: change the faction tag
factions.title: factions.title: