mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-09-26 22:39:09 +02:00
Compare commits
6 Commits
renovate/w
...
copilot/fi
Author | SHA1 | Date | |
---|---|---|---|
![]() |
4e8f775772 | ||
![]() |
31d27861e3 | ||
![]() |
78d6ca1deb | ||
![]() |
03aa1be5a3 | ||
![]() |
2e3832f1bd | ||
![]() |
05af41f832 |
@@ -17,6 +17,19 @@ repositories {
|
||||
}
|
||||
}
|
||||
|
||||
// Make sure we control the exact version of paper being included, while dropping spigot + bukkit
|
||||
configurations.all {
|
||||
exclude("org.bukkit")
|
||||
exclude("org.spigotmc")
|
||||
|
||||
resolutionStrategy.eachDependency {
|
||||
if (requested.group == "io.papermc.paper" && requested.name == "paper-api") {
|
||||
useVersion(checkNotNull(libs.paper.orNull?.version))
|
||||
because("specific paper version is required to prevent binary incompatibilities on older versions")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api(projects.plotsquaredCore)
|
||||
|
||||
@@ -28,20 +41,13 @@ dependencies {
|
||||
implementation(libs.paperlib)
|
||||
|
||||
// Plugins
|
||||
compileOnly(libs.worldeditBukkit) {
|
||||
exclude(group = "org.bukkit")
|
||||
exclude(group = "org.spigotmc")
|
||||
}
|
||||
compileOnly(libs.worldeditBukkit)
|
||||
compileOnly(libs.faweBukkit) { isTransitive = false }
|
||||
testImplementation(libs.faweBukkit) { isTransitive = false }
|
||||
compileOnly(libs.vault) {
|
||||
exclude(group = "org.bukkit")
|
||||
}
|
||||
compileOnly(libs.vault)
|
||||
compileOnly(libs.placeholderapi)
|
||||
compileOnly(libs.luckperms)
|
||||
compileOnly(libs.essentialsx) {
|
||||
exclude(group = "org.spigotmc")
|
||||
}
|
||||
compileOnly(libs.essentialsx)
|
||||
compileOnly(libs.mvdwapi) { isTransitive = false }
|
||||
|
||||
// Other libraries
|
||||
|
@@ -150,8 +150,9 @@ public class ListCmd extends SubCommand {
|
||||
page = 0;
|
||||
}
|
||||
|
||||
String world = player.getCurrentPlot().getWorldName();
|
||||
PlotArea area = player.getCurrentPlot().getArea();
|
||||
Plot currentPlot = player.getCurrentPlot();
|
||||
String world = currentPlot != null ? currentPlot.getWorldName() : null;
|
||||
PlotArea area = currentPlot != null ? currentPlot.getArea() : null;
|
||||
String arg = args[0].toLowerCase();
|
||||
final boolean[] sort = new boolean[]{true};
|
||||
|
||||
@@ -226,13 +227,17 @@ public class ListCmd extends SubCommand {
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (!player.hasPermission("plots.list.world." + world)) {
|
||||
if (world != null && !player.hasPermission("plots.list.world." + world)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (world == null) {
|
||||
player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
|
||||
return false;
|
||||
}
|
||||
plotConsumer.accept(PlotQuery.newQuery().inWorld(world));
|
||||
}
|
||||
case "expired" -> {
|
||||
@@ -257,7 +262,7 @@ public class ListCmd extends SubCommand {
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (!player.hasPermission("plots.list.world." + world)) {
|
||||
if (world != null && !player.hasPermission("plots.list.world." + world)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("permission.no_permission"),
|
||||
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
|
||||
|
@@ -20,7 +20,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "com.intellectualsites.plotsquared"
|
||||
version = "7.5.8-SNAPSHOT"
|
||||
version = "7.5.9-SNAPSHOT"
|
||||
|
||||
if (!File("$rootDir/.git").exists()) {
|
||||
logger.lifecycle("""
|
||||
|
@@ -2,7 +2,7 @@
|
||||
# Platform expectations
|
||||
paper = "1.20.4-R0.1-SNAPSHOT"
|
||||
guice = "7.0.0"
|
||||
spotbugs = "4.9.4"
|
||||
spotbugs = "4.9.6"
|
||||
checkerqual = "3.51.0"
|
||||
gson = "2.10"
|
||||
guava = "31.1-jre"
|
||||
@@ -12,7 +12,7 @@ adventure-bukkit = "4.4.1"
|
||||
log4j = "2.19.0"
|
||||
|
||||
# Plugins
|
||||
worldedit = "7.3.16"
|
||||
worldedit = "7.2.20"
|
||||
fawe = "2.13.2"
|
||||
placeholderapi = "2.11.6"
|
||||
luckperms = "5.5"
|
||||
|
Reference in New Issue
Block a user