From c86db7ab51ecde53558eefd5036cf9db56616bba Mon Sep 17 00:00:00 2001 From: DroppingAnvil Date: Sun, 26 Jan 2020 00:47:31 -0600 Subject: [PATCH 1/2] Fix system factions with custom names fly permissions. --- src/main/java/com/massivecraft/factions/cmd/CmdFly.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java index 8d8e275b..f9d51364 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java @@ -103,7 +103,7 @@ public class CmdFly extends FCommand { if (toFac.getAccess(fme, PermissableAction.FLY) == Access.ALLOW) return true; if (fme.getFaction().isWilderness()) return false; if (toFac.isSystemFaction()) - return me.hasPermission(Permission.valueOf("FLY_" + ChatColor.stripColor(toFac.getTag()).toUpperCase()).node); + return me.hasPermission(toFac.isWilderness() ? Permission.FLY_WILDERNESS.node : toFac.isSafeZone() ? Permission.FLY_SAFEZONE.node : Permission.FLY_WARZONE.node); Relation relationTo = toFac.getRelationTo(fme.getFaction()); if (!relationTo.isEnemy() && !relationTo.isMember()) return me.hasPermission(Permission.valueOf("FLY_" + relationTo.name()).node); From f34ebc73fa72966240d8a7263a8f2f8c78e87c21 Mon Sep 17 00:00:00 2001 From: DroppingAnvil Date: Sun, 26 Jan 2020 00:48:02 -0600 Subject: [PATCH 2/2] Remove unused import. --- src/main/java/com/massivecraft/factions/cmd/CmdFly.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java index f9d51364..69f70c6c 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java @@ -9,7 +9,6 @@ import com.massivecraft.factions.zcore.fperms.Access; import com.massivecraft.factions.zcore.fperms.PermissableAction; import com.massivecraft.factions.zcore.util.TL; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.GameMode; import org.bukkit.entity.Entity; import org.bukkit.entity.Player;