mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-03 06:04:43 +02:00
Compare commits
1 Commits
fix/4513
...
reenable-c
Author | SHA1 | Date | |
---|---|---|---|
ff89c614dd |
@ -104,7 +104,7 @@ tasks {
|
||||
opt.links("https://jd.papermc.io/paper/1.20/")
|
||||
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
|
||||
opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
|
||||
opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
|
||||
opt.links("https://jd.advntr.dev/api/4.14.0/")
|
||||
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
||||
opt.links("https://checkerframework.org/api/")
|
||||
opt.isLinkSource = true
|
||||
|
@ -822,18 +822,12 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
|
||||
// Temporarily classify as vehicle
|
||||
case "MINECART":
|
||||
case "MINECART_CHEST":
|
||||
case "CHEST_MINECART":
|
||||
case "MINECART_COMMAND":
|
||||
case "COMMAND_BLOCK_MINECART":
|
||||
case "MINECART_FURNACE":
|
||||
case "FURNACE_MINECART":
|
||||
case "MINECART_HOPPER":
|
||||
case "HOPPER_MINECART":
|
||||
case "MINECART_MOB_SPAWNER":
|
||||
case "SPAWNER_MINECART":
|
||||
case "ENDER_CRYSTAL":
|
||||
case "MINECART_TNT":
|
||||
case "TNT_MINECART":
|
||||
case "CHEST_BOAT":
|
||||
case "BOAT":
|
||||
if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) {
|
||||
|
@ -68,8 +68,8 @@ tasks {
|
||||
val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
|
||||
val opt = options as StandardJavadocDocletOptions
|
||||
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
|
||||
opt.links("https://jd.advntr.dev/api/" + libs.adventureApi.get().versionConstraint.toString())
|
||||
opt.links("https://jd.advntr.dev/text-minimessage/" + libs.adventureApi.get().versionConstraint.toString())
|
||||
opt.links("https://jd.advntr.dev/api/4.14.0/")
|
||||
opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
|
||||
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
||||
opt.links("https://checkerframework.org/api/")
|
||||
opt.isLinkSource = true
|
||||
|
@ -795,8 +795,9 @@ public class PlotSquared {
|
||||
if (world.equals("CheckingPlotSquaredGenerator")) {
|
||||
return;
|
||||
}
|
||||
// Don't check the return result -> breaks runtime loading of single plot areas on creation
|
||||
this.getPlotAreaManager().addWorld(world);
|
||||
if (!this.getPlotAreaManager().addWorld(world)) {
|
||||
return;
|
||||
}
|
||||
Set<String> worlds;
|
||||
if (this.worldConfiguration.contains("worlds")) {
|
||||
worlds = this.worldConfiguration.getConfigurationSection("worlds").getKeys(false);
|
||||
|
@ -184,7 +184,6 @@ public class Area extends SubCommand {
|
||||
CuboidRegion.makeCuboid(playerSelectedRegion)
|
||||
).length != 0) {
|
||||
player.sendMessage(TranslatableCaption.of("single.single_area_overlapping"));
|
||||
return false;
|
||||
}
|
||||
// Alter the region
|
||||
final BlockVector3 playerSelectionMin = playerSelectedRegion.getMinimumPoint();
|
||||
|
@ -153,7 +153,7 @@ public class Kick extends SubCommand {
|
||||
if (plot == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
return TabCompletions.completePlayersInPlot(player, plot, String.join(",", args).trim(),
|
||||
return TabCompletions.completePlayersInPlot(plot, String.join(",", args).trim(),
|
||||
Collections.singletonList(player.getName())
|
||||
);
|
||||
}
|
||||
|
@ -46,7 +46,7 @@ public class Storage extends Config {
|
||||
public static String PASSWORD = "password";
|
||||
public static String DATABASE = "plot_db";
|
||||
|
||||
@Comment("Set additional properties: https://dev.mysql.com/doc/connector-j/en/connector-j-reference-configuration-properties.html")
|
||||
@Comment("Set additional properties: https://goo.gl/wngtN8")
|
||||
public static List<String>
|
||||
PROPERTIES = new ArrayList<>(Collections.singletonList("useSSL=false"));
|
||||
|
||||
|
@ -371,10 +371,7 @@ public class EventDispatcher {
|
||||
Location location, BlockType blockType, boolean notifyPerms
|
||||
) {
|
||||
PlotArea area = location.getPlotArea();
|
||||
// the interaction target location might be outside a plot area
|
||||
if (area == null) {
|
||||
return true;
|
||||
}
|
||||
assert area != null;
|
||||
if (!area.buildRangeContainsY(location.getY()) && !player.hasPermission(Permission.PERMISSION_ADMIN_BUILD_HEIGHT_LIMIT)) {
|
||||
player.sendMessage(
|
||||
TranslatableCaption.of("height.height_limit"),
|
||||
|
@ -107,7 +107,6 @@ public final class TabCompletions {
|
||||
}
|
||||
|
||||
public static @NonNull List<Command> completePlayersInPlot(
|
||||
final @NonNull PlotPlayer<?> issuer,
|
||||
final @NonNull Plot plot,
|
||||
final @NonNull String input, final @NonNull List<String> existing
|
||||
) {
|
||||
@ -116,9 +115,7 @@ public final class TabCompletions {
|
||||
final List<PlotPlayer<?>> inPlot = plot.getPlayersInPlot();
|
||||
players = new ArrayList<>(inPlot.size());
|
||||
for (PlotPlayer<?> player : inPlot) {
|
||||
if (issuer.canSee(player)) {
|
||||
players.add(player.getName());
|
||||
}
|
||||
players.add(player.getName());
|
||||
}
|
||||
cachedCompletionValues.put("inPlot" + plot, players);
|
||||
}
|
||||
|
@ -22,7 +22,7 @@ plugins {
|
||||
}
|
||||
|
||||
group = "com.intellectualsites.plotsquared"
|
||||
version = "7.3.12-SNAPSHOT"
|
||||
version = "7.3.10-SNAPSHOT"
|
||||
|
||||
if (!File("$rootDir/.git").exists()) {
|
||||
logger.lifecycle("""
|
||||
@ -79,8 +79,8 @@ subprojects {
|
||||
|
||||
dependencies {
|
||||
// Tests
|
||||
testImplementation("org.junit.jupiter:junit-jupiter:5.11.2")
|
||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.2")
|
||||
testImplementation("org.junit.jupiter:junit-jupiter:5.11.0")
|
||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.11.0")
|
||||
}
|
||||
|
||||
plugins.withId("java") {
|
||||
|
@ -3,7 +3,7 @@
|
||||
paper = "1.20.4-R0.1-SNAPSHOT"
|
||||
guice = "7.0.0"
|
||||
spotbugs = "4.8.6"
|
||||
checkerqual = "3.48.0"
|
||||
checkerqual = "3.46.0"
|
||||
gson = "2.10"
|
||||
guava = "31.1-jre"
|
||||
snakeyaml = "2.0"
|
||||
@ -13,7 +13,7 @@ log4j = "2.19.0"
|
||||
|
||||
# Plugins
|
||||
worldedit = "7.2.20"
|
||||
fawe = "2.11.2"
|
||||
fawe = "2.11.0"
|
||||
placeholderapi = "2.11.6"
|
||||
luckperms = "5.4"
|
||||
essentialsx = "2.20.1"
|
||||
@ -26,18 +26,18 @@ cloud-services = "1.8.4"
|
||||
arkitektonika = "2.1.3"
|
||||
squirrelid = "0.3.2"
|
||||
paster = "1.1.6"
|
||||
bstats = "3.1.0"
|
||||
bstats = "3.0.2"
|
||||
paperlib = "1.0.8"
|
||||
informative-annotations = "1.5"
|
||||
vault = "1.7.1"
|
||||
serverlib = "2.3.6"
|
||||
|
||||
# Gradle plugins
|
||||
shadow = "8.3.3"
|
||||
shadow = "8.1.1"
|
||||
grgit = "4.1.1"
|
||||
spotless = "6.25.0"
|
||||
nexus = "2.0.0"
|
||||
runPaper = "2.3.1"
|
||||
runPaper = "2.3.0"
|
||||
|
||||
[libraries]
|
||||
# Platform expectations
|
||||
@ -78,7 +78,7 @@ vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault
|
||||
serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
|
||||
|
||||
[plugins]
|
||||
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
|
||||
shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
|
||||
grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
|
||||
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
|
||||
nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
|
||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
|
@ -1,4 +1,4 @@
|
||||
Javadocs generated for
|
||||
<a href="https://github.com/IntellectualSites/PlotSquared/" rel="noopener nofollow noreferrer" target="_blank"> PlotSquared</a> |
|
||||
<a href="https://intellectualsites.gitbook.io/plotsquared/" rel="noopener nofollow noreferrer"> Documentation </a> |
|
||||
Visit us on our <a href="https://discord.gg/intellectualsites" rel="noopener nofollow noreferrer"> Discord server</a> :)
|
||||
Visit us on our <a href="https://discord.gg/intellectualsites" rel="noopener nofollow noreferrer"> Discord server</a> :)
|
||||
|
Reference in New Issue
Block a user