Prepare 1.9.0 release (#89)

* Translate zh-CN.yml via GitLocalize (#65) Co-authored-by: tc7326 <tbagonepiece@gmail.com> * Translate ja.yml via GitLocalize (#64) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * French translation (#63) * Translate fr.yml via GitLocalize * Translate fr.yml via GitLocalize * Translate fr.yml via GitLocalize Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: mt-gitlocalize <mt@gitlocalize.com> Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Spanish Translation (#62) * Translate es.yml via GitLocalize * Translate es.yml via GitLocalize * Translate es.yml via GitLocalize Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: mt-gitlocalize <mt@gitlocalize.com> Co-authored-by: tastybento <tastybento@wasteofplastic.com> * German translation (#61) * Translate de.yml via GitLocalize * Translate de.yml via GitLocalize * Translate de.yml via GitLocalize Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: tastybento <tastybento@wasteofplastic.com> Co-authored-by: mt-gitlocalize <mt@gitlocalize.com> * Czech translation (#60) * Translate cs.yml via GitLocalize * Translate cs.yml via GitLocalize * Translate cs.yml via GitLocalize Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: mt-gitlocalize <mt@gitlocalize.com> Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Added possibility to prevent players from doing the fly command outside (#59) of the island protection range. Co-authored-by: tastybento <tastybento@users.noreply.github.com> * Revert "Translate ja.yml via GitLocalize (#64)" (#66) This reverts commit dd994cd. * Fix tests and add new tests to cover new config option. * Update Vietnamese (#67) * French translation (#68) * Translate fr.yml via GitLocalize * Translate fr.yml via GitLocalize * Translate fr.yml via GitLocalize Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: mt-gitlocalize <mt@gitlocalize.com> Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate es.yml via GitLocalize (#69) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate ru.yml via GitLocalize (#70) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate de.yml via GitLocalize (#71) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate zh-CN.yml via GitLocalize (#72) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate hu.yml via GitLocalize (#73) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate id.yml via GitLocalize (#74) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate cs.yml via GitLocalize (#75) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Spanish translation (#76) * Translate es.yml via GitLocalize * Translate es.yml via GitLocalize * Translate es.yml via GitLocalize Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: mt-gitlocalize <mt@gitlocalize.com> Co-authored-by: tastybento <tastybento@wasteofplastic.com> * German Translation (#77) * Translate de.yml via GitLocalize * Translate de.yml via GitLocalize * Translate de.yml via GitLocalize Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: mt-gitlocalize <mt@gitlocalize.com> Co-authored-by: tastybento <tastybento@wasteofplastic.com> * French translation (#78) * Translate fr.yml via GitLocalize * Translate fr.yml via GitLocalize * Translate fr.yml via GitLocalize Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: tastybento <tastybento@wasteofplastic.com> Co-authored-by: mt-gitlocalize <mt@gitlocalize.com> * Translate ja.yml via GitLocalize (#79) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate ko.yml via GitLocalize (#80) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate pl.yml via GitLocalize (#81) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate ro.yml via GitLocalize (#82) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate tr.yml via GitLocalize (#83) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate it.yml via GitLocalize (#84) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Translate pt.yml via GitLocalize (#85) Co-authored-by: tastybento <tastybento@wasteofplastic.com> * Update pom.xml * Fixes login flight (#88) * Upgrade to BentoBox 1.20 and Spigot 1.17 * Fixes a bug with incorrect fly mode detection onLogin due to world height changes. Co-authored-by: gitlocalize-app[bot] <55277160+gitlocalize-app[bot]@users.noreply.github.com> Co-authored-by: tc7326 <tbagonepiece@gmail.com> Co-authored-by: tastybento <tastybento@wasteofplastic.com> Co-authored-by: mt-gitlocalize <mt@gitlocalize.com> Co-authored-by: PapiCapi <49530141+PapiCapi@users.noreply.github.com> Co-authored-by: tastybento <tastybento@users.noreply.github.com> Co-authored-by: Huynh Tien <huynhqtienvtag@gmail.com>
BentoBoxWorld · May 18, 2022 · 2fef2b6 · 2fef2b6
1 parent 101eb5f
commit 2fef2b6
Show file tree

Hide file tree

Showing 25 changed files with 246 additions and 98 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,15 +44,15 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
+        <java.version>16</java.version>
         <powermock.version>2.0.2</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.16.3-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.16.0</bentobox.version>
+        <spigot.version>1.17.1-R0.1-SNAPSHOT</spigot.version>
+        <bentobox.version>1.20.0</bentobox.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- This allows to change between versions and snapshots. -->
-        <build.version>1.8.1</build.version>
+        <build.version>1.9.0</build.version>
         <build.number>-LOCAL</build.number>
     </properties>
 
@@ -138,6 +138,12 @@
             <version>${spigot.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>plugin-annotations</artifactId>
+            <version>1.2.3-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>world.bentobox</groupId>
             <artifactId>bentobox</artifactId>

diff --git a/src/main/java/world/bentobox/islandfly/FlyToggleCommand.java b/src/main/java/world/bentobox/islandfly/FlyToggleCommand.java
@@ -8,18 +8,24 @@
 import world.bentobox.bentobox.api.user.User;
 import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.bentobox.util.Util;
+import world.bentobox.islandfly.config.Settings;
 
 
 /**
  * This command allows to enable and disable fly mode.
  */
 public class FlyToggleCommand extends CompositeCommand {
+
+
+    private Settings settings;
+
     /**
      * Default constructor
      * @param parent Instance of CompositeCommand
      */
-    public FlyToggleCommand(CompositeCommand parent) {
+    public FlyToggleCommand(CompositeCommand parent, IslandFlyAddon addon) {
         super(parent, "fly");
+        this.settings = addon.getSettings();
     }
 
 
@@ -47,7 +53,7 @@ public boolean canExecute(User user, String label, List<String> args) {
 
         // Enable fly if island is a spawn and user has permission for it
         if (island.isSpawn() && user.hasPermission(this.getPermissionPrefix() + "island.flyspawn")) {
-                return true;
+            return true;
         }
 
         if (!island.isAllowed(user, IslandFlyAddon.ISLAND_FLY_PROTECTION) && !user.hasPermission(this.getPermissionPrefix() + "island.flybypass")) {
@@ -57,6 +63,15 @@ public boolean canExecute(User user, String label, List<String> args) {
         }
 
 
+        if (!this.settings.isAllowCommandOutsideProtectionRange()
+                && !island.getProtectionBoundingBox().contains(user.getLocation().toVector())) {
+
+            user.sendMessage("islandfly.outside-protection-range");
+            return false;
+
+        }
+
+
         return true;
     }
 

diff --git a/src/main/java/world/bentobox/islandfly/IslandFlyAddon.java b/src/main/java/world/bentobox/islandfly/IslandFlyAddon.java
@@ -84,7 +84,7 @@ public void onEnable() {
 
                 gameModeAddon.getPlayerCommand().ifPresent(
                         playerCommand -> {
-                            new FlyToggleCommand(playerCommand);
+                            new FlyToggleCommand(playerCommand, this);
                             hooked = true;
                         });
 

diff --git a/src/main/java/world/bentobox/islandfly/IslandFlyPladdon.java b/src/main/java/world/bentobox/islandfly/IslandFlyPladdon.java
@@ -0,0 +1,31 @@
+//
+// Created by BONNe
+// Copyright - 2022
+//
+
+
+package world.bentobox.islandfly;
+
+
+import org.bukkit.plugin.java.annotation.dependency.Dependency;
+import org.bukkit.plugin.java.annotation.plugin.ApiVersion;
+import org.bukkit.plugin.java.annotation.plugin.Plugin;
+
+import world.bentobox.bentobox.api.addons.Addon;
+import world.bentobox.bentobox.api.addons.Pladdon;
+
+
+/**
+ * @author BONNe
+ */
+@Plugin(name="Pladdon", version="1.0")
+@ApiVersion(ApiVersion.Target.v1_17)
+@Dependency(value = "BentoBox")
+public class IslandFlyPladdon extends Pladdon
+{
+    @Override
+    public Addon getAddon()
+    {
+        return new IslandFlyAddon();
+    }
+}
diff --git a/src/main/java/world/bentobox/islandfly/config/Settings.java b/src/main/java/world/bentobox/islandfly/config/Settings.java
@@ -99,6 +99,30 @@ public void setDisabledGameModes(Set<String> disabledGameModes)
     {
         this.disabledGameModes = disabledGameModes;
     }
+
+
+
+
+    /**
+     * Method Settings#isFlyDisableOnLogout returns the flyDisableOnLogout of this object.
+     *
+     * @return the flyDisableOnLogout (type boolean) of this object.
+     */
+    public boolean isAllowCommandOutsideProtectionRange()
+    {
+        return allowCommandOutsideProtectionRange;
+    }
+
+
+    /**
+     * Method Settings#setFlyDisableOnLogout sets new value for the flyDisableOnLogout of this object.
+     * @param flyDisableOnLogout new value for this object.
+     *
+     */
+    public void setAllowCommandOutsideProtectionRange(boolean commandAllowed)
+    {
+        this.allowCommandOutsideProtectionRange = commandAllowed;
+    }
 
 
     // ---------------------------------------------------------------------
@@ -125,4 +149,9 @@ public void setDisabledGameModes(Set<String> disabledGameModes)
     @ConfigComment(" - BSkyBlock")
     @ConfigEntry(path = "disabled-gamemodes")
     private Set<String> disabledGameModes = new HashSet<>();
+
+    @ConfigComment("")
+    @ConfigComment("This allows the player to use the command outside the island protection range.")
+    @ConfigEntry(path = "allow-command-outside-protection-range")
+    private boolean allowCommandOutsideProtectionRange = false;
 }
diff --git a/src/main/java/world/bentobox/islandfly/listeners/FlyLoginListener.java b/src/main/java/world/bentobox/islandfly/listeners/FlyLoginListener.java
@@ -64,6 +64,6 @@ public void onLogin(final PlayerJoinEvent event) {
 
     private boolean isInAir(Player player) {
         Block b = player.getLocation().getBlock();
-        return player.getLocation().getBlockY() > 1 && b.getRelative(BlockFace.DOWN).isEmpty() && b.getRelative(BlockFace.DOWN, 2).isEmpty();
+        return player.getLocation().getBlockY() > (player.getWorld().getMinHeight() + 1) && b.getRelative(BlockFace.DOWN).isEmpty() && b.getRelative(BlockFace.DOWN, 2).isEmpty();
     }
 }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -15,3 +15,6 @@ logout-disable-fly: false
 # disabled-gamemodes:
 #  - BSkyBlock
 disabled-gamemodes: []
+
+#This allows the player to use the command outside the island protection range.
+allow-command-outside-protection-range: false
diff --git a/src/main/resources/locales/cs.yml b/src/main/resources/locales/cs.yml
@@ -1,18 +1,19 @@
 ---
 islandfly:
-  cancel-disable: "&aJsi zpět, co? Palivo létání úspěšně doplněno!"
-  command:
-    description: povolí ti létat na tvém ostrově
-    not-allowed-fly: "&c Na tomto ostrově nemáte povoleno létat"
-    only-on-island: "&cMůžeš létat jen na tvém ostrově."
-  disable-fly: "&cTvůj mód létání byl vypnut."
-  enable-fly: "&aTvůj mód létání byl zapnut."
   fly-outside-alert: "&cJsi mimo svůj ostrov, takže mód létání se vypne za &e[number]&c
     sekund."
   fly-turning-off-alert: "&c Už zde nesmíte létat. Vypnutí letu za &e [number] &c
     sekundy."
+  disable-fly: "&cTvůj mód létání byl vypnut."
   reallowed-fly: "&a Vaše moucha byla reallowed"
+  enable-fly: "&aTvůj mód létání byl zapnut."
+  cancel-disable: "&aJsi zpět, co? Palivo létání úspěšně doplněno!"
   wrong-world: "&cNejsi ve správném světě herního módu"
+  outside-protection-range: "&c Mimo rozsah ochrany ostrova to nesmíte dělat"
+  command:
+    description: povolí ti létat na tvém ostrově
+    not-allowed-fly: "&c Na tomto ostrově nemáte povoleno létat"
+    only-on-island: "&cMůžeš létat jen na tvém ostrově."
 protection:
   flags:
     ISLAND_FLY_PROTECTION:

diff --git a/src/main/resources/locales/de.yml b/src/main/resources/locales/de.yml
@@ -1,18 +1,19 @@
 ---
 islandfly:
-  cancel-disable: "&aDu bist zurück, huh! Flugtreibstoff erfolgreich nachgefüllt!"
-  command:
-    description: ermöglicht es Ihnen, auf Ihrer Insel zu fliegen
-    not-allowed-fly: "&c Du darfst nicht auf dieser Insel fliegen"
-    only-on-island: "&cSie können nur auf Ihrer Insel fliegen."
-  disable-fly: "&cFlugmodus wurde deaktiviert."
-  enable-fly: "&aFlugmodus wurde aktiviert."
   fly-outside-alert: "&cSie befinden sich außerhalb Ihrer Insel, sodass der Flugmodus
     in &c[number]&c Sekunden deaktiviert wird."
   fly-turning-off-alert: "&c Du darfst hier nicht mehr fliegen. Ausschalten der Fliege
     in &e [number] &c Sekunden."
+  disable-fly: "&cFlugmodus wurde deaktiviert."
   reallowed-fly: "&a Deine Fliege wurde neu zugelassen"
+  enable-fly: "&aFlugmodus wurde aktiviert."
+  cancel-disable: "&aDu bist zurück, huh! Flugtreibstoff erfolgreich nachgefüllt!"
   wrong-world: "&cSie befinden sich nicht in der richtigen Gamemode-Welt"
+  outside-protection-range: "&c Das darfst du nicht außerhalb deines Inselschutzbereichs"
+  command:
+    description: ermöglicht es Ihnen, auf Ihrer Insel zu fliegen
+    not-allowed-fly: "&c Du darfst nicht auf dieser Insel fliegen"
+    only-on-island: "&cSie können nur auf Ihrer Insel fliegen."
 protection:
   flags:
     ISLAND_FLY_PROTECTION:

diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml
@@ -6,6 +6,7 @@ islandfly:
   enable-fly: "&a Your fly mode has been enabled."
   cancel-disable: "&a You are back, huh! Fly fuel successfully refilled!"
   wrong-world: "&c You are not in the right gamemode world"
+  outside-protection-range: "&c You are not allowed to do that outside your island protection range"
   command:
     description: "allows you to fly on your island"
     not-allowed-fly: "&c You are not allowed to fly on this island"

diff --git a/src/main/resources/locales/es.yml b/src/main/resources/locales/es.yml
@@ -1,18 +1,20 @@
 ---
 islandfly:
-  cancel-disable: "&a Has vuelto, ¿eh? ¡Combustible a sido rellenado correctamente!"
-  command:
-    description: te permite volar en tu isla
-    only-on-island: "&cSolo puedes volar en tu isla."
-    not-allowed-fly: "&c No tienes permitido volar en esta isla"
-  disable-fly: "&c Su modo de vuelo ha sido deshabilitado."
-  enable-fly: "&a Su modo de vuelo ha sido habilitado."
   fly-outside-alert: "&c Está fuera de su isla, por lo que el modo de vuelo se desactivará
     en &e [number] &c segundos."
-  wrong-world: "&cNo estás en el mundo del modo de juego correcto"
   fly-turning-off-alert: "&c Ya no puedes volar aquí. Desactivar volar en &e [number]
     &c segundos."
+  disable-fly: "&c Su modo de vuelo ha sido deshabilitado."
   reallowed-fly: "&a Tu mosca ha sido reajustada"
+  enable-fly: "&a Su modo de vuelo ha sido habilitado."
+  cancel-disable: "&a Has vuelto, ¿eh? ¡Combustible a sido rellenado correctamente!"
+  wrong-world: "&cNo estás en el mundo del modo de juego correcto"
+  outside-protection-range: "&c No se le permite hacer eso fuera del rango de protección
+    de su isla"
+  command:
+    description: te permite volar en tu isla
+    not-allowed-fly: "&c No tienes permitido volar en esta isla"
+    only-on-island: "&cSolo puedes volar en tu isla."
 protection:
   flags:
     ISLAND_FLY_PROTECTION:

diff --git a/src/main/resources/locales/fr.yml b/src/main/resources/locales/fr.yml
@@ -1,20 +1,22 @@
 ---
 islandfly:
+  fly-outside-alert: "&cVous êtes hors de votre île, vous ne pourrez plus voler dans
+    &e[number]&c secondes."
+  fly-turning-off-alert: "&c Vous n'êtes plus autorisé à voler ici. Désactivation
+    du vol dans &e [number] &c secondes."
+  disable-fly: "&cVous ne pouvez plus voler."
+  reallowed-fly: "&a Vous pouvez de nouveau voler"
+  enable-fly: "&aVous pouvez désormais voler."
   cancel-disable: "&aVous êtes de retour sur votre île ! Vous pouvez continuer à voler."
+  wrong-world: "&cVous n'êtes pas dans le bon monde de mode de jeu."
+  outside-protection-range: "&c Tu ne peux pas faire ça en dehors de la zone de protection
+    de ton île"
   command:
     description: vous permet de voler sur votre île
-    only-on-island: "&cVous pouvez uniquement voler sur votre île."
     not-allowed-fly: "&c Vous n'êtes pas autorisé à voler sur cette île"
-  disable-fly: "&cVous ne pouvez plus voler."
-  enable-fly: "&aVous pouvez désormais voler."
-  fly-outside-alert: "&cVous êtes hors de votre île, vous ne pourrez plus voler dans
-    &e[number]&c secondes."
-  wrong-world: "&cVous n'êtes pas dans le bon monde de mode de jeu."
-  fly-turning-off-alert: "&c Vous n'êtes plus autorisé à voler ici. Désactivation
-    de fly en &e [number] &c secondes."
-  reallowed-fly: "& a Votre mouche a été réaffectée"
+    only-on-island: "&cVous pouvez uniquement voler sur votre île."
 protection:
   flags:
     ISLAND_FLY_PROTECTION:
       description: "&a Toggle qui peut voler sur votre île"
-      name: "&a Prévention des mouches"
+      name: "&a Interdiction du vol"
diff --git a/src/main/resources/locales/hu.yml b/src/main/resources/locales/hu.yml
@@ -9,9 +9,10 @@ islandfly:
   enable-fly: "&a Az Ön repülési módja engedélyezve van."
   cancel-disable: "&a Visszatért, huh! Repülő üzemanyag feltöltése sikeresen!"
   wrong-world: "&c Nem vagy a megfelelő játékmód-világban"
+  outside-protection-range: "&c Ezt nem teheted a szigetvédelmi tartományon kívül"
   command:
-    not-allowed-fly: "&c Ezen a szigeten nem szabad repülni"
     description: lehetővé teszi repülését a szigeten
+    not-allowed-fly: "&c Ezen a szigeten nem szabad repülni"
 protection:
   flags:
     ISLAND_FLY_PROTECTION:

diff --git a/src/main/resources/locales/id.yml b/src/main/resources/locales/id.yml
@@ -9,9 +9,11 @@ islandfly:
   enable-fly: "&a Mode terbang Anda telah diaktifkan."
   cancel-disable: "&a Anda kembali, ya! Bahan bakar terbang berhasil diisi ulang!"
   wrong-world: "&c Anda tidak berada di dunia gamemode yang tepat"
+  outside-protection-range: "&c Anda tidak diperbolehkan melakukan itu di luar jangkauan
+    perlindungan pulau Anda"
   command:
-    not-allowed-fly: "&c Anda tidak diizinkan terbang di pulau ini"
     description: memungkinkan Anda untuk terbang di pulau Anda
+    not-allowed-fly: "&c Anda tidak diizinkan terbang di pulau ini"
 protection:
   flags:
     ISLAND_FLY_PROTECTION:

diff --git a/src/main/resources/locales/it.yml b/src/main/resources/locales/it.yml
@@ -9,9 +9,11 @@ islandfly:
   enable-fly: "&a La tua modalità di volo è stata abilitata."
   cancel-disable: "&a Sei tornato, eh! Vola carburante riempito con successo!"
   wrong-world: "&c Non sei nel mondo di gamemode giusto"
+  outside-protection-range: "&c Non è consentito farlo al di fuori del raggio di protezione
+    dell'isola"
   command:
-    not-allowed-fly: "&c Non ti è permesso volare su quest'isola"
     description: ti permette di volare sulla tua isola
+    not-allowed-fly: "&c Non ti è permesso volare su quest'isola"
 protection:
   flags:
     ISLAND_FLY_PROTECTION:

diff --git a/src/main/resources/locales/ja.yml b/src/main/resources/locales/ja.yml
@@ -1,16 +1,17 @@
 ---
 islandfly:
+  fly-outside-alert: "＆cあなたは島の外にいるので、＆e [number]＆c秒でフライモードは無効になります。"
+  fly-turning-off-alert: "&cあなたはもうここに飛ぶことはできません。 &e [number]&c秒後にフライをオフにします。"
+  disable-fly: "＆cフライモードは無効になっています。"
+  reallowed-fly: "＆aフライが再び許可されました"
+  enable-fly: "＆aフライモードが有効になっています。"
   cancel-disable: "＆aあなたが戻ってきた、ハァッ！フライ燃料が正常に補充されました！"
+  wrong-world: "＆cあなたは正しいゲームモードの世界にいません"
+  outside-protection-range: "&c島の保護範囲外でそれを行うことは許可されていません"
   command:
     description: あなたの島で飛ぶことができます
-    only-on-island: "＆cあなたの島でしか飛べません。"
     not-allowed-fly: "＆cこの島への飛行は許可されていません"
-  disable-fly: "＆cフライモードは無効になっています。"
-  enable-fly: "＆aフライモードが有効になっています。"
-  fly-outside-alert: "＆cあなたは島の外にいるので、＆e [number]＆c秒でフライモードは無効になります。"
-  wrong-world: "＆cあなたは正しいゲームモードの世界にいません"
-  fly-turning-off-alert: "&cあなたはもうここに飛ぶことはできません。 &e [number]&c秒後にフライをオフにします。"
-  reallowed-fly: "＆aフライが再び許可されました"
+    only-on-island: "＆cあなたの島でしか飛べません。"
 protection:
   flags:
     ISLAND_FLY_PROTECTION:

diff --git a/src/main/resources/locales/ko.yml b/src/main/resources/locales/ko.yml
@@ -7,9 +7,10 @@ islandfly:
   enable-fly: "&a 플라이 모드가 활성화되었습니다."
   cancel-disable: "&a 당신은 돌아 왔습니다! 연료가 성공적으로 보충되었습니다!"
   wrong-world: "&c 당신은 올바른 게임 모드 세계에 있지 않습니다"
+  outside-protection-range: "&c 당신은 당신의 섬 보호 범위 밖에서 그것을 할 수 없습니다"
   command:
-    not-allowed-fly: "&c 이 섬을 비행 할 수 없습니다"
     description: 당신은 당신의 섬에 비행 할 수 있습니다
+    not-allowed-fly: "&c 이 섬을 비행 할 수 없습니다"
 protection:
   flags:
     ISLAND_FLY_PROTECTION:

diff --git a/src/main/resources/locales/pl.yml b/src/main/resources/locales/pl.yml
@@ -9,9 +9,11 @@ islandfly:
   enable-fly: "&a Twój tryb latania został włączony."
   cancel-disable: "&a Wróciłeś? Paliwo zostało uzupełnione!"
   wrong-world: "&c Nie jesteś we właściwym świecie trybu gry"
+  outside-protection-range: "&c Nie możesz tego robić poza zasięgiem ochrony twojej
+    wyspy"
   command:
-    not-allowed-fly: "&c Nie wolno latać na tej wyspie"
     description: pozwala latać na swojej wyspie
+    not-allowed-fly: "&c Nie wolno latać na tej wyspie"
 protection:
   flags:
     ISLAND_FLY_PROTECTION: