Record the overwritten flight status on gamemode changes

Fixes #274
aromaa · Aug 30, 2024 · e0d50b7 · e0d50b7
1 parent 3f6f58c
commit e0d50b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/Spigot/src/main/java/net/goldtreeservers/worldguardextraflags/listeners/PlayerListener.java b/Spigot/src/main/java/net/goldtreeservers/worldguardextraflags/listeners/PlayerListener.java
@@ -167,7 +167,7 @@ public void onPlayerGameModeChangeEvent(PlayerGameModeChangeEvent event)
 					@Override
 					public void run()
 					{
-						PlayerListener.this.checkFlyStatus(player);
+						PlayerListener.this.checkFlyStatus(player, player.getAllowFlight());
 					}
 				}.runTask(WorldGuardExtraFlagsPlugin.getPlugin());
 			}
@@ -179,18 +179,25 @@ public void run()
 				@Override
 				public void run()
 				{
-					PlayerListener.this.checkFlyStatus(player);
+					PlayerListener.this.checkFlyStatus(player, null);
 				}
 			}.runTask(WorldGuardExtraFlagsPlugin.getPlugin());
 		}
 	}
 
-	private void checkFlyStatus(Player player)
+	private void checkFlyStatus(Player player, Boolean originalValueOverwrite)
 	{
-		Boolean value = this.sessionManager.get(this.worldGuardPlugin.wrapPlayer(player)).getHandler(FlyFlagHandler.class).getCurrentValue();
-		if (value != null)
+		FlyFlagHandler flyFlagHandler = this.sessionManager.get(this.worldGuardPlugin.wrapPlayer(player)).getHandler(FlyFlagHandler.class);
+
+		Boolean currentValue = flyFlagHandler.getCurrentValue();
+		if (currentValue != null)
 		{
-			player.setAllowFlight(value);
+			player.setAllowFlight(currentValue);
+		}
+
+		if (originalValueOverwrite != null)
+		{
+			flyFlagHandler.setOriginalFly(originalValueOverwrite);
 		}
 	}
 

diff --git a/WG/src/main/java/net/goldtreeservers/worldguardextraflags/wg/handlers/FlyFlagHandler.java b/WG/src/main/java/net/goldtreeservers/worldguardextraflags/wg/handlers/FlyFlagHandler.java
@@ -6,6 +6,7 @@
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.session.handler.FlagValueChangeHandler;
 import com.sk89q.worldguard.session.handler.Handler;
+import lombok.Setter;
 import org.bukkit.entity.Player;
 
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
@@ -33,7 +34,7 @@ public FlyFlagHandler create(Session session)
     }
 
     @Getter private Boolean currentValue;
-    private Boolean originalFly;
+    @Setter private Boolean originalFly;
 
 	protected FlyFlagHandler(Session session)
 	{