From 8ad2fdf8484df31421ff4a214455097b8959306f Mon Sep 17 00:00:00 2001
From: Juniormunk <theforgelover@gmail.com>
Date: Thu, 21 May 2020 01:58:05 -0400
Subject: [PATCH] Fix Bug #126

---
 .../listeners/FactionsPlayerListener.java     |  3 +-
 .../factions/zcore/persist/MemoryFPlayer.java | 63 ++++++++++---------
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
index bbd81f8e..df219f46 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
@@ -741,7 +741,8 @@ public class FactionsPlayerListener implements Listener {
                     me.attemptClaim(me.getAutoClaimFor(), newLocation, true);
                 }
                 FactionsPlugin.instance.logFactionEvent(me.getAutoClaimFor(), FLogType.CHUNK_CLAIMS, me.getName(), CC.GreenB + "CLAIMED", String.valueOf(1), (new FLocation(player.getLocation())).formatXAndZ(","));
-                if (Conf.disableFlightOnFactionClaimChange) CmdFly.disableFlight(me);
+                if (Conf.disableFlightOnFactionClaimChange && FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) CmdFly.disableFlight(me);
+
             } else if (me.isAutoSafeClaimEnabled()) {
                 if (!Permission.MANAGE_SAFE_ZONE.has(player)) {
                     me.setIsAutoSafeClaimEnabled(false);
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 14f4623e..a02263be 100644
--- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
+++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java
@@ -972,36 +972,39 @@ public abstract class MemoryFPlayer implements FPlayer {
     }
 
     public void setFFlying(boolean fly, boolean damage) {
-        Player player = getPlayer();
-        if (player == null) return;
-
-        player.setAllowFlight(fly);
-        player.setFlying(fly);
-
-        if (!damage) {
-            msg(TL.COMMAND_FLY_CHANGE, fly ? "enabled" : "disabled");
-            if (!fly) {
-                sendMessage(TL.COMMAND_FLY_COOLDOWN.toString().replace("{amount}", FactionsPlugin.getInstance().getConfig().getInt("fly-falldamage-cooldown", 3) + ""));
-            }
-        } else {
-            msg(TL.COMMAND_FLY_DAMAGE);
-        }
-
-        // If leaving fly mode, don't let them take fall damage for x seconds.
-        if (!fly) {
-            int cooldown = FactionsPlugin.getInstance().getConfig().getInt("fly-falldamage-cooldown", 3);
-            CmdFly.flyMap.remove(player.getName());
-
-            // If the value is 0 or lower, make them take fall damage.
-            // Otherwise, start a timer and have this cancel after a few seconds.
-            // Short task so we're just doing it in method. Not clean but eh.
-            if (cooldown > 0) {
-                setTakeFallDamage(false);
-                Bukkit.getScheduler().runTaskLater(FactionsPlugin.getInstance(), () -> setTakeFallDamage(true), 20L * cooldown);
-            }
-        }
-
-        isFlying = fly;
+    	if(FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight"))
+    	{
+	        Player player = getPlayer();
+	        if (player == null) return;
+	
+	        player.setAllowFlight(fly);
+	        player.setFlying(fly);
+	
+	        if (!damage) {
+	            msg(TL.COMMAND_FLY_CHANGE, fly ? "enabled" : "disabled");
+	            if (!fly) {
+	                sendMessage(TL.COMMAND_FLY_COOLDOWN.toString().replace("{amount}", FactionsPlugin.getInstance().getConfig().getInt("fly-falldamage-cooldown", 3) + ""));
+	            }
+	        } else {
+	            msg(TL.COMMAND_FLY_DAMAGE);
+	        }
+	
+	        // If leaving fly mode, don't let them take fall damage for x seconds.
+	        if (!fly) {
+	            int cooldown = FactionsPlugin.getInstance().getConfig().getInt("fly-falldamage-cooldown", 3);
+	            CmdFly.flyMap.remove(player.getName());
+	
+	            // If the value is 0 or lower, make them take fall damage.
+	            // Otherwise, start a timer and have this cancel after a few seconds.
+	            // Short task so we're just doing it in method. Not clean but eh.
+	            if (cooldown > 0) {
+	                setTakeFallDamage(false);
+	                Bukkit.getScheduler().runTaskLater(FactionsPlugin.getInstance(), () -> setTakeFallDamage(true), 20L * cooldown);
+	            }
+	        }
+	
+	        isFlying = fly;
+    	}
     }
 
     public boolean isInFactionsChest() {