From 2e9dfd6f6fe4326e80dd12690f6c8d3ca673a51e Mon Sep 17 00:00:00 2001 From: BlockyTheDev <86119630+BlockyTheDev@users.noreply.github.com> Date: Sat, 21 May 2022 07:57:22 +0200 Subject: [PATCH 1/5] chore: Update PaperMC repository endpoint (#3633) Migration - New PaperMC endpoints --- Bukkit/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index 529e2dcb2..e458936c6 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -8,7 +8,7 @@ repositories { maven { name = "PaperMC" - url = uri("https://papermc.io/repo/repository/maven-public/") + url = uri("https://repo.papermc.io/repository/maven-public/") } maven { From 62754362c2ddc86a2fc575dbd244fe8c406a9ab9 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Sat, 21 May 2022 12:01:06 +0200 Subject: [PATCH 2/5] build: Don't expose jcip and findbugs annotations to the world on runtime (#3533) * build: Don't expose jcip and findbugs * build: Revert relocation change of unpublished, shaded deps * chore: Exclude .DS_Store files --- .gitignore | 2 ++ Bukkit/build.gradle.kts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 2f3f35088..b0ccc3fff 100644 --- a/.gitignore +++ b/.gitignore @@ -131,6 +131,8 @@ local.properties checkstyle.xml classes/ *.bat + +# Other docs/ build/ diff --git a/Bukkit/build.gradle.kts b/Bukkit/build.gradle.kts index e458936c6..a6d056093 100644 --- a/Bukkit/build.gradle.kts +++ b/Bukkit/build.gradle.kts @@ -85,6 +85,8 @@ tasks.named("shadowJar") { relocate("javax.annotation", "com.plotsquared.core.annotation") relocate("com.github.spotbugs", "com.plotsquared.core.spotbugs") relocate("javax.inject", "com.plotsquared.core.annotation.inject") + relocate("net.jcip", "com.plotsquared.core.annotations.jcip") + relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs") // Get rid of all the libs which are 100% unused. minimize() From 82cd9a092cc11128bdbd183fdbfbfa1bae017624 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 24 May 2022 13:33:54 +0200 Subject: [PATCH 3/5] build: Update fawe to v2.2.0 (#3637) Co-authored-by: Renovate Bot --- 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 d66b57d56..8c095ba58 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ adventure-platform-bukkit = "4.0.1" # Plugins worldedit = "7.2.10" -fawe = "2.1.2" +fawe = "2.2.0" vault = "1.7.1" placeholderapi = "2.11.1" luckperms = "5.4" From 5eb2fc3ad0ffbe8dc8ec01c39b3233f804ff8c37 Mon Sep 17 00:00:00 2001 From: Bernhard Date: Tue, 24 May 2022 20:30:06 +0200 Subject: [PATCH 4/5] Kick players on merged plots appropriately (#3639) fix: kick denied player regardless on all connected plots --- Core/src/main/java/com/plotsquared/core/command/Deny.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Core/src/main/java/com/plotsquared/core/command/Deny.java b/Core/src/main/java/com/plotsquared/core/command/Deny.java index 0c925dd76..e38861e44 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Deny.java +++ b/Core/src/main/java/com/plotsquared/core/command/Deny.java @@ -161,6 +161,7 @@ public class Deny extends SubCommand { } private void handleKick(PlotPlayer player, Plot plot) { + plot = plot.getBasePlot(false); if (player == null) { return; } From 2c2314e95cc4c9a3ffb94ffd504ccbe434d3ca7b Mon Sep 17 00:00:00 2001 From: Bernhard Date: Wed, 25 May 2022 10:18:10 +0200 Subject: [PATCH 5/5] refactor: return `info.server` for `%plotsquared_currentplot_owner%` if plot is a server plot (#3640) --- .../core/util/placeholders/PlaceholderRegistry.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java b/Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java index f832061f5..8d6341cf9 100644 --- a/Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java +++ b/Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java @@ -38,6 +38,7 @@ import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.flag.GlobalFlagContainer; import com.plotsquared.core.plot.flag.PlotFlag; +import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag; import com.plotsquared.core.util.EventDispatcher; import com.plotsquared.core.util.PlayerManager; import net.kyori.adventure.text.Component; @@ -110,6 +111,9 @@ public final class PlaceholderRegistry { return plot.getAlias(); }); this.createPlaceholder("currentplot_owner", (player, plot) -> { + if (plot.getFlag(ServerPlotFlag.class)){ + return legacyComponent(TranslatableCaption.of("info.server"), player); + } final UUID plotOwner = plot.getOwnerAbs(); if (plotOwner == null) { return legacyComponent(TranslatableCaption.of("generic.generic_unowned"), player);