Compare commits

..

8 Commits

Author SHA1 Message Date
Alexander Brandes
8589fe90c6 Introduce 'skip.signing' property
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-04-14 21:23:32 +02:00
Alexander Brandes
bc1cc074b8 Make builds reproducible (#4395)
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-04-14 21:04:01 +02:00
renovate[bot]
d383187c6e Update dependency dev.notmyfault.serverlib:ServerLib to v2.3.6 2024-04-14 13:00:22 +00:00
renovate[bot]
125a3f6772 Update dependency dev.notmyfault.serverlib:ServerLib to v2.3.5 2024-04-14 10:20:45 +00:00
Alexander Brandes
faca8c2da0 Update wrapper action
Signed-off-by: Alexander Brandes <mc.cache@web.de>
2024-04-14 10:37:08 +02:00
renovate[bot]
0ad5ef4f94 Update gradle/wrapper-validation-action action to v3 2024-04-12 21:33:57 +00:00
Jordan
5e8d8629c2 fix: skip valid location check for world plots (#4388)
- Checking location on teleport to a single plot means the bukkit world is attempted to be accessed before it is loaded
 - we can just skip this check because we know the player will teleport to a reasonable location
2024-04-12 20:55:22 +02:00
Pierre Maurice Schwang
9f4f213a8c fix plot music volume to span full plot (#4391)
fix: plot music volume to span full plot
2024-04-12 20:55:09 +02:00
8 changed files with 13 additions and 6 deletions

View File

@@ -11,7 +11,7 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v2
uses: gradle/actions/wrapper-validation@v3
- name: Setup Java
uses: actions/setup-java@v4
with:

View File

@@ -11,7 +11,7 @@ jobs:
- name: Checkout Repository
uses: actions/checkout@v4
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v2
uses: gradle/actions/wrapper-validation@v3
- name: Setup Java
uses: actions/setup-java@v4
with:

View File

@@ -113,5 +113,6 @@ tasks {
opt.encoding("UTF-8")
opt.keyWords()
opt.addStringOption("-since", isRelease)
opt.noTimestamp()
}
}

View File

@@ -78,5 +78,6 @@ tasks {
opt.encoding("UTF-8")
opt.keyWords()
opt.addStringOption("-since", isRelease)
opt.noTimestamp()
}
}

View File

@@ -2574,7 +2574,7 @@ public class Plot {
*/
public void teleportPlayer(final PlotPlayer<?> player, TeleportCause cause, Consumer<Boolean> resultConsumer) {
Plot plot = this.getBasePlot(false);
if (!WorldUtil.isValidLocation(plot.getBottomAbs())) {
if ((getArea() == null || !(getArea() instanceof SinglePlotArea)) && !WorldUtil.isValidLocation(plot.getBottomAbs())) {
// prevent from teleporting into unsafe regions
player.sendMessage(TranslatableCaption.of("border.denied"));
resultConsumer.accept(false);

View File

@@ -37,7 +37,7 @@ import java.util.List;
public class SinglePlotManager extends PlotManager {
private static final int MAX_COORDINATE = 30000000;
private static final int MAX_COORDINATE = 20000000;
public SinglePlotManager(final @NonNull PlotArea plotArea) {
super(plotArea);

View File

@@ -118,7 +118,7 @@ subprojects {
}
signing {
if (!version.toString().endsWith("-SNAPSHOT")) {
if (!project.hasProperty("skip.signing") && !version.toString().endsWith("-SNAPSHOT")) {
val signingKey: String? by project
val signingPassword: String? by project
useInMemoryPgpKeys(signingKey, signingPassword)
@@ -209,6 +209,11 @@ subprojects {
test {
useJUnitPlatform()
}
withType<AbstractArchiveTask>().configureEach {
isPreserveFileTimestamps = false
isReproducibleFileOrder = true
}
}
}

View File

@@ -30,7 +30,7 @@ bstats = "3.0.2"
paperlib = "1.0.8"
informative-annotations = "1.4"
vault = "1.7.1"
serverlib = "2.3.4"
serverlib = "2.3.6"
# Gradle plugins
shadow = "8.1.1"