fix: attempt to address unnecessary flight status changes (#4744)

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: dordsor21

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java

@@ -600,7 +600,7 @@ public void onTeleport(PlayerTeleportEvent event) {
                 PlotArea area = location.getPlotArea();
                 if (area == null) {
                     if (lastPlot != null) {
-                        plotListener.plotExit(pp, lastPlot);
+                        plotListener.plotExit(pp, lastPlot, null, null);
                         lastPlotAccess.remove();
                     }
                     try (final MetaDataAccess<Location> lastLocationAccess =
@@ -753,7 +753,7 @@ public void playerMove(PlayerMoveEvent event) {
             if (now == null) {
                 try (final MetaDataAccess<Boolean> kickAccess =
                              pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
+                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot, now, area) && this.tmpTeleport && !kickAccess.get().orElse(
                             false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),
@@ -847,7 +847,7 @@ public void playerMove(PlayerMoveEvent event) {
             if (plot == null) {
                 try (final MetaDataAccess<Boolean> kickAccess =
                              pp.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
-                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot) && this.tmpTeleport && !kickAccess.get().orElse(
+                    if (lastPlot != null && !plotListener.plotExit(pp, lastPlot, null, area) && this.tmpTeleport && !kickAccess.get().orElse(
                             false)) {
                         pp.sendMessage(
                                 TranslatableCaption.of("permission.no_permission_event"),

Core/src/main/java/com/plotsquared/core/listener/PlotListener.java

@@ -164,7 +164,7 @@ public boolean plotEntry(final PlotPlayer<?> player, final Plot plot) {
         try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             Plot last = lastPlot.get().orElse(null);
             if ((last != null) && !last.getId().equals(plot.getId())) {
-                plotExit(player, last);
+                plotExit(player, last, plot, plot.getArea());
             }
             if (PlotSquared.platform().expireManager() != null) {
                 PlotSquared.platform().expireManager().handleEntry(player, plot);
@@ -365,7 +365,12 @@ public boolean plotEntry(final PlotPlayer<?> player, final Plot plot) {
         return true;
     }
 
-    public boolean plotExit(final PlotPlayer<?> player, Plot plot) {
+    public boolean plotExit(
+            final PlotPlayer<?> player,
+            @NonNull Plot plot,
+            @Nullable Plot nextPlot,
+            @Nullable PlotArea nextArea
+    ) {
         try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             final Plot previous = lastPlot.remove();
 
@@ -382,7 +387,9 @@ public boolean plotExit(final PlotPlayer<?> player, Plot plot) {
             if (plot.hasOwner()) {
                 PlotArea pw = plot.getArea();
                 if (pw == null) {
-                    return true;
+                    if (nextPlot == null || nextPlot.getArea() == null) {
+                        return true;
+                    }
                 }
                 try (final MetaDataAccess<Boolean> kickAccess =
                              player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_KICK)) {
@@ -440,11 +447,23 @@ public boolean plotExit(final PlotPlayer<?> player, Plot plot) {
                             player.setFlight(value.get());
                             metaDataAccess.remove();
                         } else {
-                            GameMode gameMode = player.getGameMode();
-                            if (gameMode == GameModes.SURVIVAL || gameMode == GameModes.ADVENTURE) {
-                                player.setFlight(false);
-                            } else if (!player.getFlight()) {
-                                player.setFlight(true);
+                            FlyFlag.FlyStatus flight = FlyFlag.FlyStatus.DEFAULT;
+                            if (nextPlot != null) {
+                                flight = nextPlot.getFlag(FlyFlag.class);
+                            } else if (nextArea != null) {
+                                if (nextArea.isRoadFlags()) {
+                                    flight = nextArea.getRoadFlag(FlyFlag.class);
+                                } else {
+                                    flight = nextArea.getFlag(FlyFlag.class);
+                                }
+                            }
+                            if (flight != FlyFlag.FlyStatus.ENABLED) {
+                                GameMode gameMode = player.getGameMode();
+                                if (gameMode == GameModes.SURVIVAL || gameMode == GameModes.ADVENTURE) {
+                                    player.setFlight(false);
+                                } else if (!player.getFlight()) {
+                                    player.setFlight(true);
+                                }
                             }
                         }
                     }

Core/src/main/java/com/plotsquared/core/plot/Plot.java

@@ -1340,7 +1340,7 @@ public boolean unclaim() {
         for (Plot current : getConnectedPlots()) {
             List<PlotPlayer<?>> players = current.getPlayersInPlot();
             for (PlotPlayer<?> pp : players) {
-                this.plotListener.plotExit(pp, current);
+                this.plotListener.plotExit(pp, current, null, area);
             }
 
             if (Settings.Backup.DELETE_ON_UNCLAIM) {
@@ -2594,7 +2594,7 @@ public CuboidRegion getLargestRegion() {
     public void reEnter() {
         TaskManager.runTaskLater(() -> {
             for (PlotPlayer<?> pp : Plot.this.getPlayersInPlot()) {
-                this.plotListener.plotExit(pp, Plot.this);
+                this.plotListener.plotExit(pp, Plot.this, Plot.this, area);
                 this.plotListener.plotEntry(pp, Plot.this);
             }
         }, TaskTime.ticks(1L));