Merge pull request #26 from ProSavage/improvements

Bug Fixes ready to review and update

src/main/java/com/massivecraft/factions/cmd/CmdBan.java

@@ -39,18 +39,16 @@ public class CmdBan extends FCommand {
             return;
         }
 
-        // Can the player ban for this faction?
+        // Adds bypass to admins and clean permission check
-        // Check for ALLOW access as well before we check for role.
+        if (!fme.isAdminBypassing()) {
-        if (access != Access.ALLOW) {
+            Access access = myFaction.getAccess(fme, PermissableAction.BAN);
-            if (!Permission.BAN.has(sender, true) || !assertMinRole(Role.MODERATOR)) {
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
-                return;
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "ban");
-            }
-        } else {
-            if (!Permission.BAN.has(sender, true)) {
                 return;
             }
         }
 
+
         // Good on permission checks. Now lets just ban the player.
         FPlayer target = argAsFPlayer(0);
         if (target == null) {

src/main/java/com/massivecraft/factions/cmd/CmdChest.java

@@ -30,11 +30,14 @@ public class CmdChest extends FCommand {
             fme.sendMessage("This command is disabled!");
             return;
         }
-        Access access = fme.getFaction().getAccess(fme, PermissableAction.CHEST);
+        // This permission check is way too explicit but it's clean
-        if (access.equals(Access.DENY)) {
+        if (!fme.isAdminBypassing()) {
-            fme.msg(TL.GENERIC_NOPERMISSION, "chest");
+            Access access = myFaction.getAccess(fme, PermissableAction.CHEST);
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "access chest");
+                return;
+            }
         }
-        //debug Bukkit.broadcastMessage(fme.getFaction().getUpgrade("Chest") + "");
 
         me.openInventory(fme.getFaction().getChest());
 

src/main/java/com/massivecraft/factions/cmd/CmdClaim.java

@@ -37,14 +37,15 @@ public class CmdClaim extends FCommand {
         final Faction forFaction = this.argAsFaction(1, myFaction); // Default to own
 
         if (!fme.isAdminBypassing()) {
-            Access access = forFaction.getAccess(fme, PermissableAction.TERRITORY);
+            Access access = myFaction.getAccess(fme, PermissableAction.TERRITORY);
-            if (access == Access.DENY) {
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
-                fme.msg(TL.GENERIC_NOPERMISSION, "change faction territory!");
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "change faction territory");
                 return;
             }
         }
 
 
+
         if (radius < 1) {
             msg(TL.COMMAND_CLAIM_INVALIDRADIUS);
             return;

src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java

@@ -31,6 +31,13 @@ public class CmdDeinvite extends FCommand {
     @Override
     public void perform() {
         FPlayer you = this.argAsBestFPlayerMatch(0);
+        if (!fme.isAdminBypassing()) {
+            Access access = myFaction.getAccess(fme, PermissableAction.INVITE);
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");
+                return;
+            }
+        }
         if (you == null) {
             FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
             for (String id : myFaction.getInvites()) {

src/main/java/com/massivecraft/factions/cmd/CmdDisband.java

@@ -44,16 +44,13 @@ public class CmdDisband extends FCommand {
 
         boolean isMyFaction = fme != null && faction == myFaction;
 
-        if (isMyFaction) {
+        if (!fme.isAdminBypassing()) {
-            if (!assertMinRole(Role.ADMIN)) {
+            Access access = myFaction.getAccess(fme, PermissableAction.DISBAND);
-                return;
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
-            }
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "disband faction");
-        } else {
-            if (!Permission.DISBAND_ANY.has(sender, true)) {
                 return;
             }
         }
-
         if (!faction.isNormal()) {
             msg(TL.COMMAND_DISBAND_IMMUTABLE.toString());
             return;

src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java

@@ -30,14 +30,14 @@ public class CmdFWarp extends FCommand {
     @Override
     public void perform() {
         //TODO: check if in combat.
-
+        if (!fme.isAdminBypassing()) {
-        // Check for access first.
             Access access = myFaction.getAccess(fme, PermissableAction.WARP);
-
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
-        if (access == Access.DENY) {
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use warps");
-            fme.msg(TL.GENERIC_NOPERMISSION, "warp");
                 return;
             }
+        }
+
 
         if (args.size() == 0) {
             WarpGUI warpGUI = new WarpGUI(fme);

src/main/java/com/massivecraft/factions/cmd/CmdFly.java

@@ -55,7 +55,6 @@ public class CmdFly extends FCommand {
                         }
                     }
                    
-
                     if (FPlayers.getInstance().getByPlayer(player).isVanished()) {
                         // Actually, vanished players (such as admins) should not display particles to prevent others from knowing their vanished assistance for moderation.
                         // But we can keep it as a config.

src/main/java/com/massivecraft/factions/cmd/CmdHome.java

@@ -47,6 +47,14 @@ public class CmdHome extends FCommand {
             fme.msg(TL.COMMAND_HOME_TELEPORTDISABLED);
             return;
         }
+        if (!fme.isAdminBypassing()) {
+            Access access = myFaction.getAccess(fme, PermissableAction.HOME);
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "teleport home");
+                return;
+            }
+        }
+
 
         if (!myFaction.hasHome()) {
             fme.msg(TL.COMMAND_HOME_NOHOME.toString() + (fme.getRole().value < Role.MODERATOR.value ? TL.GENERIC_ASKYOURLEADER.toString() : TL.GENERIC_YOUSHOULD.toString()));

src/main/java/com/massivecraft/factions/cmd/CmdInvite.java

@@ -50,11 +50,12 @@ public class CmdInvite extends FCommand {
 
         if (!fme.isAdminBypassing()) {
             Access access = myFaction.getAccess(fme, PermissableAction.INVITE);
-            if (access == Access.DENY || (access == Access.UNDEFINED && !assertMinRole(Role.MODERATOR))) {
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
-                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "invite");
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");
                 return;
             }
         }
+
         if (myFaction.isInvited(target)) {
             fme.msg(TL.COMMAND_INVITE_ALREADYINVITED, target.getName());
             return;

src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java

@@ -38,10 +38,14 @@ public class CmdSetFWarp extends FCommand {
         Access access = myFaction.getAccess(fme, PermissableAction.SETWARP);
         // This statement allows us to check if they've specifically denied it, or default to
         // the old setting of allowing moderators to set warps.
-        if (access == Access.DENY || (access == Access.UNDEFINED && !assertMinRole(Role.MODERATOR))) {
+        if (!fme.isAdminBypassing()) {
-            fme.msg(TL.GENERIC_NOPERMISSION, "set warp");
+            Access access = myFaction.getAccess(fme, PermissableAction.SETWARP);
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "set warps");
                 return;
             }
+        }
+
 
         int maxWarps = P.p.getConfig().getInt("max-warps", 5);
         if (maxWarps <= myFaction.getWarps().size()) {

src/main/java/com/massivecraft/factions/cmd/CmdSethome.java

@@ -40,23 +40,12 @@ public class CmdSethome extends FCommand {
             return;
         }
 
-        Access access = faction.getAccess(fme, PermissableAction.SETHOME);
+        if (!fme.isAdminBypassing()) {
-        if (access == Access.DENY) {
+            Access access = myFaction.getAccess(fme, PermissableAction.SETHOME);
-            fme.msg(TL.GENERIC_NOPERMISSION, "sethome");
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN && !Permission.SETHOME_ANY.has(sender, true)) {
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "set home");
                 return;
             }
-
-        // If player does not have allow run extra permission checks
-        if (access != Access.ALLOW) {
-            if (faction == myFaction) {
-                if (!assertMinRole(Role.MODERATOR)) {
-                    return;
-                }
-            } else {
-                if (!Permission.SETHOME_ANY.has(sender, true)) {
-                    return;
-                }
-            }
         }
 
         // Can the player set the faction home HERE?

src/main/java/com/massivecraft/factions/cmd/CmdTnt.java

@@ -36,12 +36,13 @@ public class CmdTnt extends FCommand {
             return;
         }
 
-        Access access = fme.getFaction().getAccess(fme, PermissableAction.TNTBANK);
+        if (!fme.isAdminBypassing()) {
+            Access access = myFaction.getAccess(fme, PermissableAction.TNTBANK);
             if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
-            fme.msg(TL.GENERIC_NOPERMISSION, "tntbank");
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use tnt bank");
                 return;
             }
-
+        }
 
         if (args.size() == 2) {
             if (args.get(0).equalsIgnoreCase("add") || args.get(0).equalsIgnoreCase("a")) {

src/main/java/com/massivecraft/factions/cmd/CmdTntFill.java

@@ -34,10 +34,14 @@ public class CmdTntFill extends FCommand {
 
     @Override
     public void perform() {
-        Access access = fme.getFaction().getAccess(fme, PermissableAction.TNTFILL);
+        if (!fme.isAdminBypassing()) {
-        if (access.equals(Access.DENY)) {
+            Access access = myFaction.getAccess(fme, PermissableAction.TNTFILL);
-            fme.msg(TL.GENERIC_NOPERMISSION, "tntfill");
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "use tnt fill");
+                return;
             }
+        }
+
 
 
         msg(TL.COMMAND_TNTFILL_HEADER);

src/main/java/com/massivecraft/factions/cmd/CmdUnban.java

@@ -26,21 +26,10 @@ public class CmdUnban extends FCommand {
 
     @Override
     public void perform() {
+        if (!fme.isAdminBypassing()) {
             Access access = myFaction.getAccess(fme, PermissableAction.BAN);
-        if (access == Access.DENY) {
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN && !Permission.BAN.has(sender, true)) {
-            fme.msg(TL.GENERIC_NOPERMISSION, "ban");
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage bans");
-            return;
-        }
-
-        // Can the player set the home for this faction?
-        // Check for ALLOW access as well before we check for role.
-        // TODO: no more duplicate code :(
-        if (access != Access.ALLOW) {
-            if (!Permission.BAN.has(sender) && !(assertMinRole(Role.MODERATOR))) {
-                return;
-            }
-        } else {
-            if (!Permission.BAN.has(sender, true)) {
                 return;
             }
         }

src/main/java/com/massivecraft/factions/cmd/CmdUnclaim.java

@@ -36,15 +36,13 @@ public class CmdUnclaim extends FCommand {
         final Faction forFaction = this.argAsFaction(1, myFaction); // Default to own
 
         if (!fme.isAdminBypassing()) {
-            Access access = forFaction.getAccess(fme, PermissableAction.TERRITORY);
+            Access access = myFaction.getAccess(fme, PermissableAction.TERRITORY);
-            if (access == Access.DENY) {
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
-                fme.msg(TL.GENERIC_NOPERMISSION, "change faction territory!");
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage faction territory");
                 return;
             }
         }
 
-
-
         if (radius < 1) {
             msg(TL.COMMAND_CLAIM_INVALIDRADIUS);
             return;

src/main/java/com/massivecraft/factions/cmd/FPromoteCommand.java

@@ -38,21 +38,37 @@ public class FPromoteCommand extends FCommand {
             return;
         }
 
-        Access access = myFaction.getAccess(fme.getRole(), PermissableAction.PROMOTE);
-
-        // Well this is messy.
-        if (access == null || access == Access.UNDEFINED) {
-            if (!assertMinRole(Role.MODERATOR)) {
-                return;
-            }
-        } else if (access == Access.DENY) {
-            msg(TL.COMMAND_NOACCESS);
-            return;
-        }
-
         Role current = target.getRole();
         Role promotion = Role.getRelative(current, +relative);
 
+        // Now it ain't that messy
+        if (!fme.isAdminBypassing()) {
+            Access access = myFaction.getAccess(fme, PermissableAction.PROMOTE);
+            if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
+                fme.msg(TL.GENERIC_NOPERMISSION, "manage ranks");
+                return;
+            }
+            if (target == fme) {
+                fme.msg(TL.COMMAND_PROMOTE_NOTSELF);
+                return;
+            }
+            // Don't allow people to manage role of their same rank
+            if (fme.getRole() == current) {
+                fme.msg(TL.COMMAND_PROMOTE_NOT_SAME);
+                return;
+            }
+            // Don't allow people to promote people to their same or higher rank.
+            if (fme.getRole().value <= promotion.value) {
+                fme.msg(TL.COMMAND_PROMOTE_NOT_ALLOWED);
+                return;
+            }
+        }
+        
+        if (promotion == null) {
+            fme.msg(TL.COMMAND_PROMOTE_NOTTHATPLAYER);
+            return;
+        }
+
         if (promotion == null) {
             fme.msg(TL.COMMAND_PROMOTE_NOTTHATPLAYER);
             return;

src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java

@@ -79,11 +79,12 @@ public class FactionsBlockListener implements Listener {
             return;
         }
         if (event.getBlock().getType() == Material.LEGACY_MOB_SPAWNER) {
-            Access access = fme.getFaction().getAccess(fme, PermissableAction.SPAWNER);
+            if (!fme.isAdminBypassing()) {
-            if (access.equals(Access.DENY)) {
+            Access access = myFaction.getAccess(fme, PermissableAction.SPAWNER);
-                fme.msg(TL.GENERIC_NOPERMISSION, "mine spawners");
+                if (access != Access.ALLOW && fme.getRole() != Role.ADMIN) {
-                event.setCancelled(true);
+                    fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "mine spawners");
-
+                    return;
+                }
             }
         }
     }

src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java

@@ -360,10 +360,6 @@ public class FactionsPlayerListener implements Listener {
         return false;
     }
 
-
-
-
-
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerJoin(PlayerJoinEvent event) {
         initPlayer(event.getPlayer());

src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java

@@ -29,6 +29,7 @@ public enum PermissableAction {
     SETHOME("sethome"),
     TERRITORY("territory"),
     ACCESS("access"),
+    HOME("home"),
     DISBAND("disband"),
     PROMOTE("promote"),
     SETWARP("setwarp"),

src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.java

@@ -37,23 +37,30 @@ public class FUpgradesGUI implements Listener {
             inventory.setItem(dummySlots.get(i), dummyItem);
         }
         ItemStack[] items = buildItems(fme);
-
         List<Integer> cropSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.Crops.CropItem.slots");
+        List<Integer> spawnerSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.Spawners.SpawnerItem.slots");
+        List<Integer> expSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.EXP.EXPItem.slots");
+        List<Integer> chestSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.Chest.ChestItem.slots");
+        if (cropSlots != -1) {
             for (int i = 0; i <= cropSlots.size() - 1; i++) {
                 inventory.setItem(cropSlots.get(i), items[2]);
             }
-        List<Integer> spawnerSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.Spawners.SpawnerItem.slots");
+        }
+        if (spawnerSlots != -1) {
             for (int i = 0; i <= spawnerSlots.size() - 1; i++) {
                 inventory.setItem(spawnerSlots.get(i), items[1]);
             }
-        List<Integer> expSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.EXP.EXPItem.slots");
+        }
+        if (expSlots != -1) {
             for (int i = 0; i <= expSlots.size() - 1; i++) {
                 inventory.setItem(expSlots.get(i), items[0]);
             }
-        List<Integer> chestSlots = P.p.getConfig().getIntegerList("fupgrades.MainMenu.Chest.ChestItem.slots");
+        }
+        if (chestSlots != -1) {
             for (int i = 0; i <= chestSlots.size() - 1; i++) {
                 inventory.setItem(chestSlots.get(i), items[3]);
             }
+        }
         fme.getPlayer().openInventory(inventory);
     }