Added bypass for fly checkers

Stefan923 · Sep 17, 2020 · 0e04edc · 0e04edc
1 parent b4d6aca
commit 0e04edc
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/main/java/me/stefan923/perfectflight/hooks/checkers/FactionsChecker.java b/src/main/java/me/stefan923/perfectflight/hooks/checkers/FactionsChecker.java
@@ -46,7 +46,7 @@ private boolean checkNearbyPlayers(Player player, FPlayer fplayer) {
         boolean canFly = true;
 
         FPlayers fpInstance = FPlayers.getInstance();
-        for (Player nearbyPlayer : getNearbyPlayers(player, settings.getInt("Hooks.Factions.Auto-Disable Near Enemies.Check Radius"))) {
+        for (Player nearbyPlayer : getNearbyPlayers(player, settings.getInt("Hooks.Factions.Auto-Disable Near Enemies.Check Radius"), instance)) {
             if (fplayer.getRelationTo(fpInstance.getByPlayer(nearbyPlayer)) == com.massivecraft.factions.struct.Relation.ENEMY) {
                 if (nearbyPlayer.getAllowFlight()) {
                     instance.getUser(nearbyPlayer).setFlight(false, CheckResult.NEARBY_ENEMIES);

diff --git a/src/main/java/me/stefan923/perfectflight/hooks/checkers/SaberFactionsChecker.java b/src/main/java/me/stefan923/perfectflight/hooks/checkers/SaberFactionsChecker.java
@@ -46,7 +46,7 @@ private boolean checkNearbyPlayers(Player player, FPlayer fplayer) {
         boolean canFly = true;
 
         FPlayers fpInstance = FPlayers.getInstance();
-        for (Player nearbyPlayer : getNearbyPlayers(player, settings.getInt("Hooks.Factions.Auto-Disable Near Enemies.Check Radius"))) {
+        for (Player nearbyPlayer : getNearbyPlayers(player, settings.getInt("Hooks.Factions.Auto-Disable Near Enemies.Check Radius"), instance)) {
             if (fplayer.getRelationTo(fpInstance.getByPlayer(nearbyPlayer)) == Relation.ENEMY) {
                 if (nearbyPlayer.getAllowFlight()) {
                     instance.getUser(nearbyPlayer).setFlight(false, CheckResult.NEARBY_ENEMIES);

diff --git a/src/main/java/me/stefan923/perfectflight/utils/PlayerUtils.java b/src/main/java/me/stefan923/perfectflight/utils/PlayerUtils.java
@@ -1,5 +1,6 @@
 package me.stefan923.perfectflight.utils;
 
+import me.stefan923.perfectflight.PerfectFlight;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
@@ -8,14 +9,15 @@
 
 public interface PlayerUtils {
 
-    default List<Player> getNearbyPlayers(Player player, int distance) {
+    default List<Player> getNearbyPlayers(Player player, int distance, PerfectFlight instance) {
         List<Player> list = new ArrayList<>();
 
         for (Entity entity : player.getNearbyEntities(distance, distance, distance)) {
             if (entity instanceof Player) {
                 Player nearbyPlayer = (Player) entity;
+                User nearbyUser = instance.getUser(nearbyPlayer);
 
-                if (nearbyPlayer.canSee(player) && player.canSee(nearbyPlayer))
+                if (!nearbyUser.isBypassing() && nearbyPlayer.canSee(player) && player.canSee(nearbyPlayer))
                     list.add(nearbyPlayer);
             }
         }

diff --git a/src/main/java/me/stefan923/perfectflight/utils/User.java b/src/main/java/me/stefan923/perfectflight/utils/User.java
@@ -12,12 +12,14 @@ public class User implements MessageUtils {
     private final Player player;
 
     private boolean enableFly;
+    private boolean isBypassing;
     private long noFallDamageDuration;
 
     public User(PerfectFlight instance, Player player) {
         this.instance = instance;
         this.player = player;
         this.enableFly = true;
+        this.isBypassing = false;
         this.noFallDamageDuration = 0;
 
         instance.getUsers().put(player, this);
@@ -31,6 +33,14 @@ public boolean getFly() {
         return enableFly;
     }
 
+    public boolean isBypassing() {
+        return isBypassing;
+    }
+
+    public void setBypassing(boolean bypassing) {
+        isBypassing = bypassing;
+    }
+
     public long getNoFallDamageDuration() {
         return noFallDamageDuration;
     }
@@ -104,6 +114,10 @@ public void checkFly() {
     }
 
     public CheckResult canFly() {
+        if (isBypassing) {
+            return CheckResult.ALLOWED;
+        }
+
         for (AbstractChecker checker : instance.getCheckers()) {
             CheckResult checkResult = checker.canFlyAtLocation(player);
             if (checkResult != CheckResult.ALLOWED) {
@@ -112,5 +126,4 @@ public CheckResult canFly() {
         }
         return CheckResult.ALLOWED;
     }
-
 }