Make the height that is protected configurable as well. (#402)

* Add the ability to protect an area surrounding the flag from building,
to prevent abuse when the editable materials feature is used.

Closes #398.

* Also make the height that is protected configurable.

* Fix line length

Author: LlmDl

src/main/java/io/github/townyadvanced/flagwar/config/FlagWarConfig.java

@@ -578,6 +578,13 @@ public static int getFlagAreaProtectedSize() {
         return PLUGIN.getConfig().getInt("warzone.protected_area_surrounding_flag");
     }
 
+    /**
+     * @return the height of the protection area surrounding the flag.
+     */
+    public static int getFlagAreaProtectedHeight() {
+        return PLUGIN.getConfig().getInt("warzone.protected_area_above_flag");
+    }
+
     /** @return whether nations are allowed to toggle neutral.*/
     public static boolean isDeclaringNeutralAllowed() {
         return PLUGIN.getConfig().getBoolean("rules.nations_can_toggle_neutral");

src/main/java/io/github/townyadvanced/flagwar/listeners/WarzoneListener.java

@@ -97,11 +97,7 @@ public void onBuild(final TownyBuildEvent townyBuildEvent) {
             return;
         }
 
-        if (isTooCloseToTheFlag(status, townyBuildEvent)) {
-            return;
-        }
-
-        if (!FlagWarConfig.isEditableMaterialInWarZone(mat)) {
+        if (!FlagWarConfig.isEditableMaterialInWarZone(mat) || isTooCloseToTheFlag(status, townyBuildEvent)) {
             townyBuildEvent.setCancelled(true);
             townyBuildEvent.setCancelMessage(msgCannotEdit("build", mat));
             return;
@@ -273,8 +269,9 @@ private boolean isTooCloseToTheFlag(final TownBlockStatus townBlockStatus,
         Location blockLoc = townyActionEvent.getLocation();
         CellUnderAttack cellData = FlagWarAPI.getAttackData(Cell.parse(blockLoc));
         Location flagLoc = cellData.getFlagBaseBlock().getLocation();
-        // We don't care if the flag is above the block being placed.
-        if (blockLoc.getY() < flagLoc.getY()) {
+        // We don't care if the flag is above the block being placed, or if the block is too high above the flag.
+        if (blockLoc.getY() < flagLoc.getY()
+                || (blockLoc.getY() - flagLoc.getY()) > FlagWarConfig.getFlagAreaProtectedHeight()) {
             return false;
         }
         // Set the y value to the flag y value so we compare only the horizontal distance.

src/main/resources/config.yml

@@ -160,6 +160,8 @@ warzone:
 
     # The space around the flag where editable materials cannot be used.
     protected_area_surrounding_flag: 0
+    # The space above the flag where editable materials cannot be used.
+    protected_area_above_flag: 20
 extra:
     # If enabled, show additional debug messages as warnings. Recommended keeping these disabled unless requested.
     debug: false