Compare commits

..

6 Commits

Author SHA1 Message Date
copilot-swe-agent[bot]
4e8f775772 Fix NullPointerException when listing plots from console
Co-authored-by: NotMyFault <13383509+NotMyFault@users.noreply.github.com>
2025-09-26 20:10:44 +00:00
copilot-swe-agent[bot]
31d27861e3 Initial plan 2025-09-26 20:04:12 +00:00
renovate[bot]
78d6ca1deb Update dependency com.github.spotbugs:spotbugs-annotations to v4.9.6 (#4759)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-09-22 00:41:24 +00:00
Alexander Brandes
03aa1be5a3 Back to snapshot for development
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2025-09-19 21:56:38 +02:00
Alexander Brandes
2e3832f1bd Release 7.5.8
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2025-09-19 21:55:57 +02:00
Pierre Maurice Schwang
05af41f832 fix: binary incompatibility on 1.21.1 (#4758) 2025-09-19 08:55:39 +02:00
4 changed files with 28 additions and 17 deletions

View File

@@ -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 { dependencies {
api(projects.plotsquaredCore) api(projects.plotsquaredCore)
@@ -28,20 +41,13 @@ dependencies {
implementation(libs.paperlib) implementation(libs.paperlib)
// Plugins // Plugins
compileOnly(libs.worldeditBukkit) { compileOnly(libs.worldeditBukkit)
exclude(group = "org.bukkit")
exclude(group = "org.spigotmc")
}
compileOnly(libs.faweBukkit) { isTransitive = false } compileOnly(libs.faweBukkit) { isTransitive = false }
testImplementation(libs.faweBukkit) { isTransitive = false } testImplementation(libs.faweBukkit) { isTransitive = false }
compileOnly(libs.vault) { compileOnly(libs.vault)
exclude(group = "org.bukkit")
}
compileOnly(libs.placeholderapi) compileOnly(libs.placeholderapi)
compileOnly(libs.luckperms) compileOnly(libs.luckperms)
compileOnly(libs.essentialsx) { compileOnly(libs.essentialsx)
exclude(group = "org.spigotmc")
}
compileOnly(libs.mvdwapi) { isTransitive = false } compileOnly(libs.mvdwapi) { isTransitive = false }
// Other libraries // Other libraries

View File

@@ -150,8 +150,9 @@ public class ListCmd extends SubCommand {
page = 0; page = 0;
} }
String world = player.getCurrentPlot().getWorldName(); Plot currentPlot = player.getCurrentPlot();
PlotArea area = player.getCurrentPlot().getArea(); String world = currentPlot != null ? currentPlot.getWorldName() : null;
PlotArea area = currentPlot != null ? currentPlot.getArea() : null;
String arg = args[0].toLowerCase(); String arg = args[0].toLowerCase();
final boolean[] sort = new boolean[]{true}; final boolean[] sort = new boolean[]{true};
@@ -226,13 +227,17 @@ public class ListCmd extends SubCommand {
); );
return false; return false;
} }
if (!player.hasPermission("plots.list.world." + world)) { if (world != null && !player.hasPermission("plots.list.world." + world)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world))) TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))
); );
return false; return false;
} }
if (world == null) {
player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
return false;
}
plotConsumer.accept(PlotQuery.newQuery().inWorld(world)); plotConsumer.accept(PlotQuery.newQuery().inWorld(world));
} }
case "expired" -> { case "expired" -> {
@@ -257,7 +262,7 @@ public class ListCmd extends SubCommand {
); );
return false; return false;
} }
if (!player.hasPermission("plots.list.world." + world)) { if (world != null && !player.hasPermission("plots.list.world." + world)) {
player.sendMessage( player.sendMessage(
TranslatableCaption.of("permission.no_permission"), TranslatableCaption.of("permission.no_permission"),
TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world))) TagResolver.resolver("node", Tag.inserting(Component.text("plots.list.world." + world)))

View File

@@ -20,7 +20,7 @@ plugins {
} }
group = "com.intellectualsites.plotsquared" group = "com.intellectualsites.plotsquared"
version = "7.5.8-SNAPSHOT" version = "7.5.9-SNAPSHOT"
if (!File("$rootDir/.git").exists()) { if (!File("$rootDir/.git").exists()) {
logger.lifecycle(""" logger.lifecycle("""

View File

@@ -2,7 +2,7 @@
# Platform expectations # Platform expectations
paper = "1.20.4-R0.1-SNAPSHOT" paper = "1.20.4-R0.1-SNAPSHOT"
guice = "7.0.0" guice = "7.0.0"
spotbugs = "4.9.4" spotbugs = "4.9.6"
checkerqual = "3.51.0" checkerqual = "3.51.0"
gson = "2.10" gson = "2.10"
guava = "31.1-jre" guava = "31.1-jre"
@@ -12,7 +12,7 @@ adventure-bukkit = "4.4.1"
log4j = "2.19.0" log4j = "2.19.0"
# Plugins # Plugins
worldedit = "7.3.16" worldedit = "7.2.20"
fawe = "2.13.2" fawe = "2.13.2"
placeholderapi = "2.11.6" placeholderapi = "2.11.6"
luckperms = "5.5" luckperms = "5.5"