docs

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -30,7 +30,14 @@ body:
         - '1.20.4'
         - '1.20'
         - '1.19.4'
+        - '1.19.3'
+        - '1.19.2'
+        - '1.19.1'
+        - '1.19'
         - '1.18.2'
+        - '1.18.1'
+        - '1.17.1'
+        - '1.16.5'
     validations:
       required: true
 

.github/renovate.json

@@ -9,6 +9,7 @@
     "dependencies"
   ],
   "rebaseWhen": "conflicted",
+  "schedule": ["on the first day of the month"],
   "ignoreDeps": [
     "com.google.code.gson:gson",
     "com.google.guava:guava",

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

@@ -670,11 +670,7 @@ public class BlockEventListener implements Listener {
                 BlockBreakEvent call = new BlockBreakEvent(block, player);
                 Bukkit.getServer().getPluginManager().callEvent(call);
                 if (!call.isCancelled()) {
-                    if (Settings.Flags.INSTABREAK_CONSIDER_TOOL) {
-                        block.breakNaturally(event.getItemInHand());
-                    } else {
-                        block.breakNaturally();
-                    }
+                    event.getBlock().breakNaturally();
                 }
             }
             // == rather than <= as we only care about the "ground level" not being destroyed

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

@@ -40,7 +40,6 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.FlagContainer;
 import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
-import com.plotsquared.core.plot.flag.implementations.FishingFlag;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
@@ -349,11 +348,6 @@ public class PaperListener implements Listener {
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
-                if (plot.getFlag(FishingFlag.class)) {
-                    return;
-                }
-            }
             if (!plot.getFlag(ProjectilesFlag.class)) {
                 if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
                     pp.sendMessage(

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

@@ -28,14 +28,12 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.PlotHandler;
-import com.plotsquared.core.plot.flag.implementations.FishingFlag;
 import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.PlotFlagUtil;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
@@ -134,11 +132,6 @@ public class ProjectileEventListener implements Listener {
                 event.setCancelled(true);
             }
         } else if (!plot.isAdded(pp.getUUID())) {
-            if (entity.getType().equals(EntityType.FISHING_HOOK)) {
-                if (plot.getFlag(FishingFlag.class)) {
-                    return;
-                }
-            }
             if (!plot.getFlag(ProjectilesFlag.class)) {
                 if (!pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER)) {
                     pp.sendMessage(
@@ -194,8 +187,7 @@ public class ProjectileEventListener implements Listener {
                 return;
             }
             if (plot.isAdded(pp.getUUID()) || pp.hasPermission(Permission.PERMISSION_ADMIN_PROJECTILE_OTHER) || plot.getFlag(
-                    ProjectilesFlag.class) || (entity.getType().equals(EntityType.FISHING_HOOK) && plot.getFlag(
-                    FishingFlag.class))) {
+                    ProjectilesFlag.class)) {
                 return;
             }
             entity.remove();

Core/src/main/java/com/plotsquared/core/configuration/Settings.java

@@ -723,12 +723,6 @@ public class Settings extends Config {
 
     }
 
-    @Comment("Settings related to flags")
-    public static final class Flags {
-
-        @Comment("If \"instabreak\" should consider the used tool.")
-        public static boolean INSTABREAK_CONSIDER_TOOL = false;
-    }
 
     @Comment({"Enable or disable parts of the plugin",
             "Note: A cache will use some memory if enabled"})

Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java

@@ -48,7 +48,6 @@ import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag;
 import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
 import com.plotsquared.core.plot.flag.implementations.FarewellFlag;
 import com.plotsquared.core.plot.flag.implementations.FeedFlag;
-import com.plotsquared.core.plot.flag.implementations.FishingFlag;
 import com.plotsquared.core.plot.flag.implementations.FlyFlag;
 import com.plotsquared.core.plot.flag.implementations.ForcefieldFlag;
 import com.plotsquared.core.plot.flag.implementations.GamemodeFlag;
@@ -159,7 +158,6 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(EditSignFlag.EDIT_SIGN_FALSE);
         this.addFlag(EntityChangeBlockFlag.ENTITY_CHANGE_BLOCK_FALSE);
         this.addFlag(ExplosionFlag.EXPLOSION_FALSE);
-        this.addFlag(FishingFlag.FISHING_FALSE);
         this.addFlag(ForcefieldFlag.FORCEFIELD_FALSE);
         this.addFlag(GrassGrowFlag.GRASS_GROW_TRUE);
         this.addFlag(HangingBreakFlag.HANGING_BREAK_FALSE);

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/FishingFlag.java

@@ -1,39 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.plot.flag.implementations;
-
-import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.plot.flag.types.BooleanFlag;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-public class FishingFlag extends BooleanFlag<FishingFlag> {
-
-    public static final FishingFlag FISHING_TRUE = new FishingFlag(true);
-    public static final FishingFlag FISHING_FALSE = new FishingFlag(false);
-
-    private FishingFlag(boolean value) {
-        super(value, TranslatableCaption.of("flags.flag_description_fishing"));
-    }
-
-    @Override
-    protected FishingFlag flagOf(@NonNull final Boolean value) {
-        return value ? FISHING_TRUE : FISHING_FALSE;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/util/WorldUtil.java

@@ -65,7 +65,7 @@ public abstract class WorldUtil {
     /**
      * {@return whether the given location is valid in the world}
      * @param location the location to check
-     * @since 7.3.6
+     * @since TODO
      */
     public static boolean isValidLocation(Location location) {
         return Math.abs(location.getX()) < 30000000 && Math.abs(location.getZ()) < 30000000;

Core/src/main/resources/lang/messages_en.json

@@ -559,7 +559,6 @@
   "flags.flag_description_drop_protection": "<gray>Set to `true` to prevent dropped items from being picked up by non-members of the plot.</gray>",
   "flags.flag_description_edit_sign": "<gray>Set to `true` to allow editing signs in the plot.</gray>",
   "flags.flag_description_feed": "<gray>Specify an interval in seconds and an optional amount by which the players will be fed (amount is 1 by default).</gray>",
-  "flags.flag_description_fishing": "<gray>Set to `true` to allow guests to use a fishing rod in the plot.</gray>",
   "flags.flag_description_forcefield": "<gray>Set to `true` to enable member forcefield in the plot.</gray>",
   "flags.flag_description_grass_grow": "<gray>Set to `false` to prevent grass from growing within the plot.</gray>",
   "flags.flag_description_hanging_break": "<gray>Set to `true` to allow guests to break hanging objects in the plot.</gray>",

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.3.7-SNAPSHOT"
+version = "7.3.6-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -225,7 +225,7 @@ tasks.getByName<Jar>("jar") {
     enabled = false
 }
 
-val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.1", "1.20.4")
+val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.4")
 tasks {
     register("cacheLatestFaweArtifact") {
         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()

gradle/libs.versions.toml

@@ -7,13 +7,13 @@ checkerqual = "3.42.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.16.0"
+adventure = "4.15.0"
 adventure-bukkit = "4.3.2"
 log4j = "2.19.0"
 
 # Plugins
-worldedit = "7.2.20"
-fawe = "2.9.1"
+worldedit = "7.2.18"
+fawe = "2.9.0"
 placeholderapi = "2.11.5"
 luckperms = "5.4"
 essentialsx = "2.20.1"