From 693c8313274c4cc64db5e976056a9c02c7783336 Mon Sep 17 00:00:00 2001
From: Dariasc <dariascauas@gmail.com>
Date: Tue, 6 Mar 2018 16:46:55 -0300
Subject: [PATCH] Add Admin and Permission check to /f perm (#1062)

* Remove perms Action

* Add Permission check to /f perm

* Refactor flight perm

* Add fly perm to GUI

* Remove useless perm check
---
 src/main/java/com/massivecraft/factions/cmd/CmdPerm.java      | 2 +-
 src/main/java/com/massivecraft/factions/cmd/CmdSethome.java   | 2 +-
 .../massivecraft/factions/zcore/fperms/PermissableAction.java | 3 +--
 .../massivecraft/factions/zcore/persist/MemoryFPlayer.java    | 2 +-
 src/main/resources/config.yml                                 | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdPerm.java b/src/main/java/com/massivecraft/factions/cmd/CmdPerm.java
index 4934b242..2ca2e814 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPerm.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdPerm.java
@@ -34,7 +34,7 @@ public class CmdPerm extends FCommand {
         senderMustBePlayer = true;
         senderMustBeMember = true;
         senderMustBeModerator = false;
-        senderMustBeAdmin = false;
+        senderMustBeAdmin = true;
     }
 
     @Override
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java
index 1ebd4cec..d1bdb022 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java
@@ -48,7 +48,7 @@ public class CmdSethome extends FCommand {
         // Can the player set the home for this faction?
         // Check for ALLOW access as well before we check for role.
         if (faction == myFaction && access != Access.ALLOW) {
-            if (!Permission.SETHOME_ANY.has(sender) || !assertMinRole(Role.MODERATOR)) {
+            if (!Permission.SETHOME_ANY.has(sender, true) || !assertMinRole(Role.MODERATOR)) {
                 return;
             }
         } else {
diff --git a/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java b/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java
index d06e9805..5c0238e0 100644
--- a/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java
+++ b/src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java
@@ -32,10 +32,9 @@ public enum PermissableAction {
     ACCESS("access"),
     DISBAND("disband"),
     PROMOTE("promote"),
-    PERMS("perms"),
     SETWARP("setwarp"),
     WARP("warp"),
-    FLIGHT("fly"),;
+    FLY("fly"),;
 
     private String name;
 
diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
index dde53459..46e8e481 100644
--- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
+++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
@@ -938,7 +938,7 @@ public abstract class MemoryFPlayer implements FPlayer {
             return true;
         }
 
-        Access access = faction.getAccess(this, PermissableAction.FLIGHT);
+        Access access = faction.getAccess(this, PermissableAction.FLY);
         return access != null && access == Access.ALLOW;
     }
 
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 09469c97..527576ff 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -460,7 +460,7 @@ fperm-gui:
       warp: 26
       ban: 27
       disband: 28
-      perms: 29
+      fly: 29
     # Material to show, if the material is colorable eg: Wool, Stained Clay it will update with it's access color
     materials:
       build: STAINED_CLAY
@@ -483,7 +483,7 @@ fperm-gui:
       warp: STAINED_CLAY
       ban: STAINED_CLAY
       disband: STAINED_CLAY
-      perms: STAINED_CLAY
+      fly: STAINED_CLAY
     # Same dummy items format as above
     dummy-items:
       '0':