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 529e2dcb2..a6d056093 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 { @@ -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() 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 398c3c87b..28da51a0f 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Deny.java +++ b/Core/src/main/java/com/plotsquared/core/command/Deny.java @@ -166,6 +166,7 @@ public class Deny extends SubCommand { } private void handleKick(PlotPlayer player, Plot plot) { + plot = plot.getBasePlot(false); if (player == null) { return; } 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 45a43eaf1..8b5f914b0 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; @@ -109,6 +110,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); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d955850b0..af0a12953 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ adventure-platform-bukkit = "4.1.0" # Plugins worldedit = "7.2.10" -fawe = "2.1.2" +fawe = "2.2.0" vault = "1.7.1" placeholderapi = "2.11.1" luckperms = "5.4"