mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-13 02:44:44 +02:00
Compare commits
13 Commits
fix/chunkG
...
fix/stop-i
Author | SHA1 | Date | |
---|---|---|---|
e2bb8a4b32 | |||
c523feeb79 | |||
958c66b28f | |||
c656190e14 | |||
e914cb210e | |||
94c6af74d2 | |||
ebb82bd66d | |||
66f907eb5d | |||
9ffede2c5c | |||
97172df0dc | |||
c9746b182c | |||
10a2b80ffc | |||
ca0f38255d |
@ -11,7 +11,7 @@ jobs:
|
||||
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
|
||||
DISCORD_USERNAME: PlotSquared Release
|
||||
DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png
|
||||
uses: Ilshidur/action-discord@08d9328877d6954120eef2b07abbc79249bb6210 # ratchet:Ilshidur/action-discord@0.3.2
|
||||
uses: Ilshidur/action-discord@0.3.2
|
||||
with:
|
||||
args: |
|
||||
"<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"
|
||||
|
2
.github/workflows/build-pr.yml
vendored
2
.github/workflows/build-pr.yml
vendored
@ -11,7 +11,7 @@ jobs:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Validate Gradle Wrapper
|
||||
uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
|
||||
uses: gradle/wrapper-validation-action@v1
|
||||
- name: Setup Java
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
|
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@ -11,7 +11,7 @@ jobs:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Validate Gradle Wrapper
|
||||
uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
|
||||
uses: gradle/wrapper-validation-action@v1
|
||||
- name: Setup Java
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
@ -43,7 +43,7 @@ jobs:
|
||||
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
|
||||
- name: Publish core javadoc
|
||||
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
|
||||
uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73
|
||||
uses: cpina/github-action-push-to-another-repository@main
|
||||
env:
|
||||
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
|
||||
with:
|
||||
@ -55,7 +55,7 @@ jobs:
|
||||
target-directory: v7/core
|
||||
- name: Publish bukkit javadoc
|
||||
if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
|
||||
uses: cpina/github-action-push-to-another-repository@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
|
||||
uses: cpina/github-action-push-to-another-repository@main
|
||||
env:
|
||||
SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
|
||||
with:
|
||||
|
6
.github/workflows/codeql.yml
vendored
6
.github/workflows/codeql.yml
vendored
@ -22,10 +22,10 @@ jobs:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v3
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@168b99b3c22180941ae7dbdd5f5c9678ede476ba # v2
|
||||
uses: github/codeql-action/init@v2
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
- name: Autobuild
|
||||
uses: github/codeql-action/autobuild@168b99b3c22180941ae7dbdd5f5c9678ede476ba # v2
|
||||
uses: github/codeql-action/autobuild@v2
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@168b99b3c22180941ae7dbdd5f5c9678ede476ba # v2
|
||||
uses: github/codeql-action/analyze@v2
|
||||
|
@ -270,8 +270,7 @@ public class StateWrapper {
|
||||
if (!PaperLib.isPaper()) {
|
||||
if (!paperErrorTextureSent) {
|
||||
paperErrorTextureSent = true;
|
||||
LOGGER.error("Failed to populate skull data in your road schematic - Please use Paper to correctly " +
|
||||
"generate skulls in your road schematics!");
|
||||
LOGGER.error("Failed to populate skull data in your road schematic - This is a Spigot limitation.");
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -103,7 +103,7 @@ public class Done extends SubCommand {
|
||||
public void run(PlotAnalysis value) {
|
||||
plot.removeRunning();
|
||||
boolean result =
|
||||
value.getComplexity(doneRequirements) <= doneRequirements.THRESHOLD;
|
||||
value.getComplexity(doneRequirements) >= doneRequirements.THRESHOLD;
|
||||
finish(plot, player, result);
|
||||
}
|
||||
});
|
||||
|
@ -20,7 +20,6 @@ package com.plotsquared.core.plot;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Sets;
|
||||
import com.google.inject.Inject;
|
||||
import com.plotsquared.core.PlotSquared;
|
||||
import com.plotsquared.core.command.Like;
|
||||
@ -2418,7 +2417,6 @@ public class Plot {
|
||||
if (!this.isMerged()) {
|
||||
Location pos1 = this.getBottomAbs().withY(getArea().getMinBuildHeight());
|
||||
Location pos2 = this.getTopAbs().withY(getArea().getMaxBuildHeight());
|
||||
this.connectedCache = Sets.newHashSet(this);
|
||||
CuboidRegion rg = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
|
||||
return Collections.singleton(rg);
|
||||
}
|
||||
|
@ -25,11 +25,17 @@ import com.plotsquared.core.plot.PlotAreaTerrainType;
|
||||
import com.plotsquared.core.plot.PlotAreaType;
|
||||
import com.plotsquared.core.plot.PlotId;
|
||||
import com.plotsquared.core.util.SetupUtils;
|
||||
import org.jetbrains.annotations.Contract;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class PlotAreaBuilder {
|
||||
|
||||
private String generatorName;
|
||||
private String plotManager;
|
||||
@Nullable
|
||||
private PlotAreaType plotAreaType;
|
||||
private PlotAreaTerrainType terrainType;
|
||||
private String worldName;
|
||||
@ -85,8 +91,10 @@ public class PlotAreaBuilder {
|
||||
return this.plotManager;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Contract(" -> !null")
|
||||
public PlotAreaType plotAreaType() {
|
||||
return this.plotAreaType;
|
||||
return Objects.requireNonNullElse(this.plotAreaType, PlotAreaType.NORMAL);
|
||||
}
|
||||
|
||||
public PlotAreaTerrainType terrainType() {
|
||||
@ -127,7 +135,8 @@ public class PlotAreaBuilder {
|
||||
return this;
|
||||
}
|
||||
|
||||
public PlotAreaBuilder plotAreaType(PlotAreaType plotAreaType) {
|
||||
public PlotAreaBuilder plotAreaType(@NotNull PlotAreaType plotAreaType) {
|
||||
Objects.requireNonNull(plotAreaType, "PlotAreaType must not be null");
|
||||
this.plotAreaType = plotAreaType;
|
||||
return this;
|
||||
}
|
||||
|
@ -17,7 +17,7 @@ plugins {
|
||||
eclipse
|
||||
idea
|
||||
|
||||
id("xyz.jpenilla.run-paper") version "2.0.1"
|
||||
id("xyz.jpenilla.run-paper") version "2.1.0"
|
||||
}
|
||||
|
||||
group = "com.plotsquared"
|
||||
@ -77,12 +77,12 @@ subprojects {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(platform("com.intellectualsites.bom:bom-newest:1.25"))
|
||||
implementation(platform("com.intellectualsites.bom:bom-newest:1.27"))
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// Tests
|
||||
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
|
||||
testImplementation("org.junit.jupiter:junit-jupiter:5.9.3")
|
||||
}
|
||||
|
||||
plugins.withId("java") {
|
||||
|
@ -20,7 +20,7 @@ squirrelid = "0.3.2"
|
||||
# Gradle plugins
|
||||
shadow = "7.1.2"
|
||||
grgit = "4.1.1"
|
||||
spotless = "6.17.0"
|
||||
spotless = "6.18.0"
|
||||
nexus = "1.3.0"
|
||||
|
||||
[libraries]
|
||||
|
Reference in New Issue
Block a user