mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-09 09:04:43 +02:00
Compare commits
1 Commits
7.3.8
...
fix/plotMu
Author | SHA1 | Date | |
---|---|---|---|
8607b9c49c |
2
.github/workflows/build-pr.yml
vendored
2
.github/workflows/build-pr.yml
vendored
@ -11,7 +11,7 @@ jobs:
|
|||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Validate Gradle Wrapper
|
- name: Validate Gradle Wrapper
|
||||||
uses: gradle/actions/wrapper-validation@v3
|
uses: gradle/wrapper-validation-action@v2
|
||||||
- name: Setup Java
|
- name: Setup Java
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -11,7 +11,7 @@ jobs:
|
|||||||
- name: Checkout Repository
|
- name: Checkout Repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Validate Gradle Wrapper
|
- name: Validate Gradle Wrapper
|
||||||
uses: gradle/actions/wrapper-validation@v3
|
uses: gradle/wrapper-validation-action@v2
|
||||||
- name: Setup Java
|
- name: Setup Java
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
|
@ -113,6 +113,5 @@ tasks {
|
|||||||
opt.encoding("UTF-8")
|
opt.encoding("UTF-8")
|
||||||
opt.keyWords()
|
opt.keyWords()
|
||||||
opt.addStringOption("-since", isRelease)
|
opt.addStringOption("-since", isRelease)
|
||||||
opt.noTimestamp()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -78,6 +78,5 @@ tasks {
|
|||||||
opt.encoding("UTF-8")
|
opt.encoding("UTF-8")
|
||||||
opt.keyWords()
|
opt.keyWords()
|
||||||
opt.addStringOption("-since", isRelease)
|
opt.addStringOption("-since", isRelease)
|
||||||
opt.noTimestamp()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2574,7 +2574,7 @@ public class Plot {
|
|||||||
*/
|
*/
|
||||||
public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) {
|
public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) {
|
||||||
Plot plot = this.getBasePlot(false);
|
Plot plot = this.getBasePlot(false);
|
||||||
if ((getArea() == null || !(getArea() instanceof SinglePlotArea)) && !WorldUtil.isValidLocation(plot.getBottomAbs())) {
|
if (!WorldUtil.isValidLocation(plot.getBottomAbs())) {
|
||||||
// prevent from teleporting into unsafe regions
|
// prevent from teleporting into unsafe regions
|
||||||
player.sendMessage(TranslatableCaption.of("border.denied"));
|
player.sendMessage(TranslatableCaption.of("border.denied"));
|
||||||
resultConsumer.accept(false);
|
resultConsumer.accept(false);
|
||||||
|
@ -37,7 +37,7 @@ import java.util.List;
|
|||||||
|
|
||||||
public class SinglePlotManager extends PlotManager {
|
public class SinglePlotManager extends PlotManager {
|
||||||
|
|
||||||
private static final int MAX_COORDINATE = 20000000;
|
private static final int MAX_COORDINATE = 30000000;
|
||||||
|
|
||||||
public SinglePlotManager(final @NonNull PlotArea plotArea) {
|
public SinglePlotManager(final @NonNull PlotArea plotArea) {
|
||||||
super(plotArea);
|
super(plotArea);
|
||||||
|
@ -22,7 +22,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "com.intellectualsites.plotsquared"
|
group = "com.intellectualsites.plotsquared"
|
||||||
version = "7.3.8"
|
version = "7.3.8-SNAPSHOT"
|
||||||
|
|
||||||
if (!File("$rootDir/.git").exists()) {
|
if (!File("$rootDir/.git").exists()) {
|
||||||
logger.lifecycle("""
|
logger.lifecycle("""
|
||||||
@ -118,7 +118,7 @@ subprojects {
|
|||||||
}
|
}
|
||||||
|
|
||||||
signing {
|
signing {
|
||||||
if (!project.hasProperty("skip.signing") && !version.toString().endsWith("-SNAPSHOT")) {
|
if (!version.toString().endsWith("-SNAPSHOT")) {
|
||||||
val signingKey: String? by project
|
val signingKey: String? by project
|
||||||
val signingPassword: String? by project
|
val signingPassword: String? by project
|
||||||
useInMemoryPgpKeys(signingKey, signingPassword)
|
useInMemoryPgpKeys(signingKey, signingPassword)
|
||||||
@ -209,11 +209,6 @@ subprojects {
|
|||||||
test {
|
test {
|
||||||
useJUnitPlatform()
|
useJUnitPlatform()
|
||||||
}
|
}
|
||||||
|
|
||||||
withType<AbstractArchiveTask>().configureEach {
|
|
||||||
isPreserveFileTimestamps = false
|
|
||||||
isReproducibleFileOrder = true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,14 +23,14 @@ mvdwapi = "3.1.1"
|
|||||||
prtree = "2.0.1"
|
prtree = "2.0.1"
|
||||||
aopalliance = "1.0"
|
aopalliance = "1.0"
|
||||||
cloud-services = "1.8.4"
|
cloud-services = "1.8.4"
|
||||||
arkitektonika = "2.1.3"
|
arkitektonika = "2.1.2"
|
||||||
squirrelid = "0.3.2"
|
squirrelid = "0.3.2"
|
||||||
paster = "1.1.6"
|
paster = "1.1.5"
|
||||||
bstats = "3.0.2"
|
bstats = "3.0.2"
|
||||||
paperlib = "1.0.8"
|
paperlib = "1.0.8"
|
||||||
informative-annotations = "1.5"
|
informative-annotations = "1.4"
|
||||||
vault = "1.7.1"
|
vault = "1.7.1"
|
||||||
serverlib = "2.3.6"
|
serverlib = "2.3.4"
|
||||||
|
|
||||||
# Gradle plugins
|
# Gradle plugins
|
||||||
shadow = "8.1.1"
|
shadow = "8.1.1"
|
||||||
|
Reference in New Issue
Block a user