Major f perm fix; Fix sethome permission check (#1079)

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

@@ -108,16 +108,13 @@ public class CmdPerm extends FCommand {
     }
 
     private Permissable getPermissable(String name) {
-        try {
+        if (Role.fromString(name.toUpperCase()) != null) {
-            return Relation.valueOf(name.toUpperCase());
+            return Role.fromString(name.toUpperCase());
-        } catch (Exception e) {
+        } else if (Relation.fromString(name.toUpperCase()) != null) {
+            return Relation.fromString(name.toUpperCase());
+        } else {
+            return null;
         }
-        try {
-            return Role.valueOf(name.toUpperCase());
-        } catch (Exception e) {
-        }
-
-        return null;
     }
 
     @Override

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

@@ -45,15 +45,16 @@ public class CmdSethome extends FCommand {
             return;
         }
 
-        // Can the player set the home for this faction?
+        // If player does not have allow run extra permission checks
-        // Check for ALLOW access as well before we check for role.
+        if (access != Access.ALLOW) {
-        if (faction == myFaction && access != Access.ALLOW) {
+            if (faction == myFaction) {
-            if (!Permission.SETHOME_ANY.has(sender, true) || !assertMinRole(Role.MODERATOR)) {
+                if (!assertMinRole(Role.MODERATOR)) {
-                return;
+                    return;
-            }
+                }
-        } else {
+            } else {
-            if (!Permission.SETHOME_ANY.has(sender, true)) {
+                if (!Permission.SETHOME_ANY.has(sender, true)) {
-                return;
+                    return;
+                }
             }
         }
 

src/main/java/com/massivecraft/factions/struct/Role.java

@@ -104,7 +104,6 @@ public enum Role implements Permissable {
         return "";
     }
 
-
     // Utility method to build items for F Perm GUI
     @Override
     public ItemStack buildItem() {
@@ -113,7 +112,7 @@ public enum Role implements Permissable {
         String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", ""));
         List<String> lore = new ArrayList<>();
 
-        Material material = Material.matchMaterial(RELATION_CONFIG.getString("materials." + name().toLowerCase()));
+        Material material = Material.matchMaterial(RELATION_CONFIG.getString("materials." + name().toLowerCase(), "STAINED_CLAY"));
         if (material == null) {
             return null;
         }

src/main/java/com/massivecraft/factions/zcore/fperms/gui/PermissableRelationGUI.java

@@ -96,16 +96,13 @@ public class PermissableRelationGUI implements InventoryHolder, FactionGUI {
     }
 
     private Permissable getPermissable(String name) {
-        try {
+        if (Role.fromString(name.toUpperCase()) != null) {
-            return Relation.valueOf(name.toUpperCase());
+            return Role.fromString(name.toUpperCase());
-        } catch (Exception e) {
+        } else if (Relation.fromString(name.toUpperCase()) != null) {
+            return Relation.fromString(name.toUpperCase());
+        } else {
+            return null;
         }
-        try {
-            return Role.valueOf(name.toUpperCase());
-        } catch (Exception e) {
-        }
-
-        return null;
     }
 
     private void buildItems() {

src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java

@@ -419,7 +419,9 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
 
         // Put the map in there for each relation.
         for (Relation relation : Relation.values()) {
-            permissions.put(relation, new HashMap<>(freshMap));
+            if (relation != Relation.MEMBER) {
+                permissions.put(relation, new HashMap<>(freshMap));
+            }
         }
 
         // And each role.

src/main/resources/config.yml

@@ -379,7 +379,7 @@ fperm-gui:
     # Note: Slots start at 0 and end at one less that GUI size
     slots:
       recruit: 10
-      member: 11
+      normal: 11
       moderator: 12
       truce: 13
       ally: 14
@@ -388,7 +388,7 @@ fperm-gui:
     # Material to be displayed
     materials:
       recruit: WOOD_SWORD
-      member: STONE_SWORD
+      normal: STONE_SWORD
       moderator: IRON_SWORD
       truce: IRON_AXE
       ally: DIAMOND_SWORD