From f1905d04a33105ccfe19a5ce41eb205b14fde4fa Mon Sep 17 00:00:00 2001
From: Trent Hensler <drtshock13@gmail.com>
Date: Sun, 4 Mar 2018 14:16:17 -0800
Subject: [PATCH] factions.fly as the perm node

---
 src/main/java/com/massivecraft/factions/cmd/CmdFly.java       | 3 ++-
 .../java/com/massivecraft/factions/struct/Permission.java     | 4 ++--
 src/main/resources/plugin.yml                                 | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
index 1b46db52..c849cd95 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
@@ -15,13 +15,14 @@ public class CmdFly extends FCommand {
 
         this.optionalArgs.put("on/off", "flip");
 
-        this.permission = Permission.FLIGHT.node;
+        this.permission = Permission.FLY.node;
         this.senderMustBeMember = true;
         this.senderMustBeModerator = false;
     }
 
     @Override
     public void perform() {
+        // Disabled by default.
         if (!P.p.getConfig().getBoolean("enable-faction-flight", false)) {
             fme.msg(TL.COMMAND_FLY_DISABLED);
             return;
diff --git a/src/main/java/com/massivecraft/factions/struct/Permission.java b/src/main/java/com/massivecraft/factions/struct/Permission.java
index fb985d22..87c588cc 100644
--- a/src/main/java/com/massivecraft/factions/struct/Permission.java
+++ b/src/main/java/com/massivecraft/factions/struct/Permission.java
@@ -28,6 +28,7 @@ public enum Permission {
     DESCRIPTION("description"),
     DISBAND("disband"),
     DISBAND_ANY("disband.any"),
+    FLY("fly"),
     HELP("help"),
     HOME("home"),
     INVITE("invite"),
@@ -87,8 +88,7 @@ public enum Permission {
     TOP("top"),
     VAULT("vault"),
     SETMAXVAULTS("setmaxvaults"),
-    WARP("warp"),
-    FLIGHT("flight");
+    WARP("warp");
 
     public final String node;
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index b36b9bc1..f2df48f5 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -283,5 +283,5 @@ permissions:
     description: Set your /f map height.
   factions.ban:
     description: Ban players from Factions
-  factions.flight:
+  factions.fly:
     description: Allow use of /f fly