Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-21 11:45:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v6' into v7

Browse Source
This commit is contained in:
Alexander Brandes 2022-05-29 22:05:17 +02:00
commit 62197f3deb
No known key found for this signature in database
GPG Key ID: 158F5701A6AAD00C
5 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -131,6 +131,8 @@ local.properties
checkstyle.xml
classes/
*.bat
# Other
docs/
build/

4
Bukkit/build.gradle.kts
View File

@ -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>("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()

1
Core/src/main/java/com/plotsquared/core/command/Deny.java
View File

@ -166,6 +166,7 @@ public class Deny extends SubCommand {
}
private void handleKick(PlotPlayer<?> player, Plot plot) {
plot = plot.getBasePlot(false);
if (player == null) {
return;
}

4
Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java
View File

@ -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);

2
gradle/libs.versions.toml
View File

@ -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"