diff --git a/build.gradle b/build.gradle index c1b6b27a..bc39c5fb 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ plugins { allprojects { group 'me.William278' - version '1.1.2' + version '1.1.3' compileJava { options.encoding = 'UTF-8' } tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java b/bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java index 2477a993..9b0264ee 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java +++ b/bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java @@ -23,6 +23,7 @@ public class ConfigLoader { Settings.syncGameMode = config.getBoolean("synchronisation_settings.game_mode", true); Settings.syncAdvancements = config.getBoolean("synchronisation_settings.advancements", true); Settings.syncLocation = config.getBoolean("synchronisation_settings.location", false); + Settings.syncFlight = config.getBoolean("synchronisation_settings.flight", false); } } diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java b/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java index cfc3e4da..0b5c3670 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java +++ b/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java @@ -191,9 +191,14 @@ public class PlayerSetter { player.setGameMode(GameMode.valueOf(data.getGameMode())); } if (Settings.syncLocation) { - player.setFlying(player.getAllowFlight() && data.isFlying()); setPlayerLocation(player, DataSerializer.deserializePlayerLocationData(data.getSerializedLocation())); } + if (Settings.syncFlight) { + if (data.isFlying()) { + player.setAllowFlight(true); + } + player.setFlying(player.getAllowFlight() && data.isFlying()); + } // Handle the SyncCompleteEvent Bukkit.getPluginManager().callEvent(new SyncCompleteEvent(player, data)); diff --git a/bukkit/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml index 7250b037..136c3e09 100644 --- a/bukkit/src/main/resources/config.yml +++ b/bukkit/src/main/resources/config.yml @@ -13,5 +13,6 @@ synchronisation_settings: game_mode: true advancements: true location: false + flight: false cluster_id: 'main' check_for_updates: true \ No newline at end of file diff --git a/common/src/main/java/me/william278/husksync/Settings.java b/common/src/main/java/me/william278/husksync/Settings.java index 88b6ad89..eabeed4f 100644 --- a/common/src/main/java/me/william278/husksync/Settings.java +++ b/common/src/main/java/me/william278/husksync/Settings.java @@ -65,6 +65,7 @@ public class Settings { public static boolean syncGameMode; public static boolean syncAdvancements; public static boolean syncLocation; + public static boolean syncFlight; // This Cluster ID public static String cluster;