mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-24 16:15:27 +02:00
Compare commits
5 Commits
6.9.0
...
fix/v6/cle
Author | SHA1 | Date | |
---|---|---|---|
![]() |
cb7d1d30a4 | ||
![]() |
bb0aa8d5cc | ||
![]() |
d69f3b0893 | ||
![]() |
565838ad43 | ||
![]() |
8b52461271 |
@@ -100,7 +100,7 @@ tasks {
|
|||||||
opt.links("https://jd.papermc.io/paper/1.18/")
|
opt.links("https://jd.papermc.io/paper/1.18/")
|
||||||
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
|
opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
|
||||||
opt.links("https://javadoc.io/doc/com.plotsquared/PlotSquared-Core/latest/")
|
opt.links("https://javadoc.io/doc/com.plotsquared/PlotSquared-Core/latest/")
|
||||||
opt.links("https://jd.adventure.kyori.net/api/" + libs.adventure.get().versionConstraint.toString())
|
opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
|
||||||
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
||||||
opt.links("https://checkerframework.org/api/")
|
opt.links("https://checkerframework.org/api/")
|
||||||
}
|
}
|
||||||
|
@@ -59,7 +59,7 @@ tasks {
|
|||||||
withType<Javadoc> {
|
withType<Javadoc> {
|
||||||
val opt = options as StandardJavadocDocletOptions
|
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://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
|
||||||
opt.links("https://jd.adventure.kyori.net/api/" + libs.adventure.get().versionConstraint.toString())
|
opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
|
||||||
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
|
||||||
opt.links("https://checkerframework.org/api/")
|
opt.links("https://checkerframework.org/api/")
|
||||||
}
|
}
|
||||||
|
@@ -37,6 +37,7 @@ import com.plotsquared.core.events.PlotComponentSetEvent;
|
|||||||
import com.plotsquared.core.events.PlotMergeEvent;
|
import com.plotsquared.core.events.PlotMergeEvent;
|
||||||
import com.plotsquared.core.events.PlotUnlinkEvent;
|
import com.plotsquared.core.events.PlotUnlinkEvent;
|
||||||
import com.plotsquared.core.events.Result;
|
import com.plotsquared.core.events.Result;
|
||||||
|
import com.plotsquared.core.generator.ClassicPlotWorld;
|
||||||
import com.plotsquared.core.generator.SquarePlotWorld;
|
import com.plotsquared.core.generator.SquarePlotWorld;
|
||||||
import com.plotsquared.core.inject.factory.ProgressSubscriberFactory;
|
import com.plotsquared.core.inject.factory.ProgressSubscriberFactory;
|
||||||
import com.plotsquared.core.location.Direction;
|
import com.plotsquared.core.location.Direction;
|
||||||
@@ -255,6 +256,9 @@ public final class PlotModificationManager {
|
|||||||
manager.unClaimPlot(current, null, queue);
|
manager.unClaimPlot(current, null, queue);
|
||||||
} else {
|
} else {
|
||||||
manager.claimPlot(current, queue);
|
manager.claimPlot(current, queue);
|
||||||
|
if (plot.getArea() instanceof ClassicPlotWorld cpw) {
|
||||||
|
manager.setComponent(current.getId(), "wall", cpw.WALL_FILLING.toPattern(), actor, queue);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (queue.size() > 0) {
|
if (queue.size() > 0) {
|
||||||
|
@@ -18,10 +18,11 @@ plugins {
|
|||||||
idea
|
idea
|
||||||
}
|
}
|
||||||
|
|
||||||
version = "6.9.0"
|
|
||||||
|
|
||||||
allprojects {
|
|
||||||
group = "com.plotsquared"
|
group = "com.plotsquared"
|
||||||
|
version = "6.9.1-SNAPSHOT"
|
||||||
|
|
||||||
|
subprojects {
|
||||||
|
group = rootProject.group
|
||||||
version = rootProject.version
|
version = rootProject.version
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@@ -50,9 +51,7 @@ allprojects {
|
|||||||
url = uri("https://maven.enginehub.org/repo/")
|
url = uri("https://maven.enginehub.org/repo/")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
subprojects {
|
|
||||||
apply {
|
apply {
|
||||||
plugin<JavaPlugin>()
|
plugin<JavaPlugin>()
|
||||||
plugin<JavaLibraryPlugin>()
|
plugin<JavaLibraryPlugin>()
|
||||||
@@ -66,11 +65,9 @@ subprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.2"))
|
implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.5"))
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
allprojects {
|
|
||||||
dependencies {
|
dependencies {
|
||||||
// Tests
|
// Tests
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
|
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
|
||||||
@@ -188,7 +185,6 @@ allprojects {
|
|||||||
shadowJar {
|
shadowJar {
|
||||||
this.archiveClassifier.set(null as String?)
|
this.archiveClassifier.set(null as String?)
|
||||||
this.archiveFileName.set("${project.name}-${project.version}.${this.archiveExtension.getOrElse("jar")}")
|
this.archiveFileName.set("${project.name}-${project.version}.${this.archiveExtension.getOrElse("jar")}")
|
||||||
this.destinationDirectory.set(rootProject.tasks.shadowJar.get().destinationDirectory.get())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
named("build") {
|
named("build") {
|
||||||
@@ -198,7 +194,6 @@ allprojects {
|
|||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
nexusPublishing {
|
nexusPublishing {
|
||||||
@@ -209,3 +204,7 @@ nexusPublishing {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.getByName<Jar>("jar") {
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
@@ -5,11 +5,6 @@ checker-qual = "3.22.0"
|
|||||||
guice = "5.1.0"
|
guice = "5.1.0"
|
||||||
spotbugs = "4.7.0"
|
spotbugs = "4.7.0"
|
||||||
|
|
||||||
# Adventure & MiniMessage
|
|
||||||
adventure-api = "4.9.3"
|
|
||||||
adventure-text-minimessage = "4.1.0-SNAPSHOT"
|
|
||||||
adventure-platform-bukkit = "4.0.1"
|
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
worldedit = "7.2.10"
|
worldedit = "7.2.10"
|
||||||
placeholderapi = "2.11.1"
|
placeholderapi = "2.11.1"
|
||||||
@@ -41,11 +36,6 @@ guice = { group = "com.google.inject", name = "guice", version.ref = "guice" }
|
|||||||
guiceassistedinject = { group = "com.google.inject.extensions", name = "guice-assistedinject", version.ref = "guice" }
|
guiceassistedinject = { group = "com.google.inject.extensions", name = "guice-assistedinject", version.ref = "guice" }
|
||||||
spotbugs = { group = "com.github.spotbugs", name = "spotbugs-annotations", version.ref = "spotbugs" }
|
spotbugs = { group = "com.github.spotbugs", name = "spotbugs-annotations", version.ref = "spotbugs" }
|
||||||
|
|
||||||
# Adventure & MiniMessage
|
|
||||||
adventure = { group = "net.kyori", name = "adventure-api", version.ref = "adventure-api" }
|
|
||||||
minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure-text-minimessage" }
|
|
||||||
adventurePlatformBukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventure-platform-bukkit" }
|
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
worldeditCore = { group = "com.sk89q.worldedit", name = "worldedit-core", version.ref = "worldedit" }
|
worldeditCore = { group = "com.sk89q.worldedit", name = "worldedit-core", version.ref = "worldedit" }
|
||||||
worldeditBukkit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version.ref = "worldedit" }
|
worldeditBukkit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version.ref = "worldedit" }
|
||||||
|
@@ -3,14 +3,6 @@
|
|||||||
"config:base",
|
"config:base",
|
||||||
":disableDependencyDashboard"
|
":disableDependencyDashboard"
|
||||||
],
|
],
|
||||||
"ignoreDeps": [
|
|
||||||
"guava",
|
|
||||||
"com.google.guava:guava",
|
|
||||||
"com.google.code.gson:gson",
|
|
||||||
"gson",
|
|
||||||
"snakeyaml",
|
|
||||||
"net.kyori"
|
|
||||||
],
|
|
||||||
"timezone": "Europe/Berlin",
|
"timezone": "Europe/Berlin",
|
||||||
"schedule": [
|
"schedule": [
|
||||||
"every monday"
|
"every monday"
|
||||||
|
Reference in New Issue
Block a user