From c46cc73f527b98b6c5b512175f3c07e815167f05 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Sun, 5 Mar 2023 00:03:39 +0100 Subject: [PATCH 1/4] Turn down renovate a bit --- renovate.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 54da313f2..3659d5f48 100644 --- a/renovate.json +++ b/renovate.json @@ -4,6 +4,7 @@ "config:base", ":semanticCommitsDisabled" ], - "labels": ["Renovate"], - "rebaseWhen": "conflicted" + "labels": ["dependencies"], + "rebaseWhen": "conflicted", + "schedule": ["on the first day of the week"] } From fc3137cd963abe3f8576e494a5ab8b504d7ab9cf Mon Sep 17 00:00:00 2001 From: ByteExceptionM Date: Sun, 5 Mar 2023 10:15:05 +0100 Subject: [PATCH 2/4] Fix farmland moisturize (#3978) * fix: Fix farmland gets moisturizes Signed-off-by: ByteExceptionM * chore: Revert code reformat Signed-off-by: ByteExceptionM --------- Signed-off-by: ByteExceptionM --- .../bukkit/listener/BlockEventListener.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java index fe58c41b7..8ae570bd1 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listener/BlockEventListener.java @@ -71,6 +71,7 @@ import org.bukkit.block.BlockFace; import org.bukkit.block.BlockState; import org.bukkit.block.data.BlockData; import org.bukkit.block.data.type.Dispenser; +import org.bukkit.block.data.type.Farmland; import org.bukkit.entity.Entity; import org.bukkit.entity.Fireball; import org.bukkit.entity.Player; @@ -709,20 +710,33 @@ public class BlockEventListener implements Listener { Block block = event.getBlock(); Location location = BukkitUtil.adapt(block.getLocation()); PlotArea area = location.getPlotArea(); + if (area == null) { return; } + Plot plot = area.getOwnedPlot(location); + if (plot == null) { event.setCancelled(true); return; } - Material blockType = block.getType(); - if (blockType == Material.FARMLAND) { - if (!plot.getFlag(SoilDryFlag.class)) { - plot.debug("Soil could not dry because soil-dry = false"); - event.setCancelled(true); + + if (block.getBlockData() instanceof Farmland farmland && event.getNewState().getBlockData() instanceof Farmland newFarmland) { + int currentMoisture = farmland.getMoisture(); + int newMoisture = newFarmland.getMoisture(); + + // farmland gets moisturizes + if (newMoisture > currentMoisture) { + return; } + + if (plot.getFlag(SoilDryFlag.class)) { + return; + } + + plot.debug("Soil could not dry because soil-dry = false"); + event.setCancelled(true); } } From 1326c257a0f2a85066e604864b756c4b4314721a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 10:15:27 +0100 Subject: [PATCH 3/4] Update dependency com.intellectualsites.arkitektonika:Arkitektonika-Client to v2.1.2 (#3972) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 33a64e7ec..70177d258 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ mvdwapi = "3.1.1" prtree = "2.0.1" aopalliance = "1.0" cloud-services = "1.8.2" -arkitektonika = "2.1.1" +arkitektonika = "2.1.2" squirrelid = "0.3.1" http4j = "1.3" From 52823f5024294b7f29b0443d805b8594b84f8e77 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Mar 2023 10:15:38 +0100 Subject: [PATCH 4/4] Update Ilshidur/action-discord digest to 08d9328 (#3974) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/announce-release-on-discord.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/announce-release-on-discord.yml b/.github/workflows/announce-release-on-discord.yml index 717c8ca0f..b3daa209a 100644 --- a/.github/workflows/announce-release-on-discord.yml +++ b/.github/workflows/announce-release-on-discord.yml @@ -11,7 +11,7 @@ jobs: DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} DISCORD_USERNAME: PlotSquared Release DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png - uses: Ilshidur/action-discord@0c4b27844ba47cb1c7bee539c8eead5284ce9fa9 # ratchet:Ilshidur/action-discord@0.3.2 + uses: Ilshidur/action-discord@08d9328877d6954120eef2b07abbc79249bb6210 # ratchet:Ilshidur/action-discord@0.3.2 with: args: | "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"