SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Initial Commit

Browse Source
This commit is contained in:
Driftay
2019-06-28 16:46:45 -04:00
parent 8b08c4f72a
commit 1fd3220e5e
6 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/massivecraft/factions/cmd/CmdInviteAlt.java
View File

@@ -53,10 +53,12 @@ public class CmdInviteAlt extends FCommand {
return;
}
Access access = myFaction.getAccess(target, PermissableAction.INVITEALT);
if (access == Access.DENY || (access == Access.UNDEFINED && !assertMinRole(Role.MODERATOR))) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "invitealt");
return;
if (!fme.isAdminBypassing()) {
Access access = myFaction.getAccess(fme, PermissableAction.INVITE);
if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");
return;
}
}
if (myFaction.isBanned(target)) {

8
src/main/java/com/massivecraft/factions/cmd/CmdKickAlt.java
View File

@@ -62,9 +62,9 @@ public class CmdKickAlt extends FCommand{
// requirements
if (!Permission.KICK_ANY.has(sender)) {
Access access = myFaction.getAccess(fme, PermissableAction.KICKALT);
Access access = myFaction.getAccess(fme, PermissableAction.KICK);
if (access == Access.DENY || (access == Access.UNDEFINED && !assertMinRole(Role.MODERATOR))) {
fme.msg(TL.GENERIC_NOPERMISSION, "kickalt");
fme.msg(TL.GENERIC_NOPERMISSION, "kick");
return;
}
@@ -90,12 +90,12 @@ public class CmdKickAlt extends FCommand{
}
}
Access access = myFaction.getAccess(fme, PermissableAction.KICKALT);
Access access = myFaction.getAccess(fme, PermissableAction.KICK);
// This statement allows us to check if they've specifically denied it,
// or default to
// the old setting of allowing moderators to kick
if (access == Access.DENY || (access == Access.UNDEFINED && !assertMinRole(Role.MODERATOR))) {
fme.msg(TL.GENERIC_NOPERMISSION, "kickalt");
fme.msg(TL.GENERIC_NOPERMISSION, "kick");
return;
}