mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-29 10:35:27 +02:00
Compare commits
5 Commits
renovate/s
...
renovate/n
Author | SHA1 | Date | |
---|---|---|---|
![]() |
62de0b9d2c | ||
![]() |
e9cab5f1a3 | ||
![]() |
956deb2144 | ||
![]() |
45b012f38b | ||
![]() |
f11f5f0dfb |
6
.github/workflows/codeql.yml
vendored
6
.github/workflows/codeql.yml
vendored
@@ -22,10 +22,10 @@ jobs:
|
|||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
- name: Initialize CodeQL
|
- name: Initialize CodeQL
|
||||||
uses: github/codeql-action/init@168b99b3c22180941ae7dbdd5f5c9678ede476ba # v2
|
uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
|
||||||
with:
|
with:
|
||||||
languages: ${{ matrix.language }}
|
languages: ${{ matrix.language }}
|
||||||
- name: Autobuild
|
- name: Autobuild
|
||||||
uses: github/codeql-action/autobuild@168b99b3c22180941ae7dbdd5f5c9678ede476ba # v2
|
uses: github/codeql-action/autobuild@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
|
||||||
- name: Perform CodeQL Analysis
|
- name: Perform CodeQL Analysis
|
||||||
uses: github/codeql-action/analyze@168b99b3c22180941ae7dbdd5f5c9678ede476ba # v2
|
uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
|
||||||
|
@@ -185,35 +185,6 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
|
|||||||
world.setWaterAnimalSpawnLimit(limit);
|
world.setWaterAnimalSpawnLimit(limit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void generateNoise(
|
|
||||||
@NotNull final WorldInfo worldInfo,
|
|
||||||
@NotNull final Random random,
|
|
||||||
final int chunkX,
|
|
||||||
final int chunkZ,
|
|
||||||
@NotNull final ChunkData chunkData
|
|
||||||
) {
|
|
||||||
if (this.platformGenerator != this) {
|
|
||||||
this.platformGenerator.generateNoise(worldInfo, random, chunkX, chunkZ, chunkData);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
int minY = chunkData.getMinHeight();
|
|
||||||
int maxY = chunkData.getMaxHeight();
|
|
||||||
GenChunk result = new GenChunk(minY, maxY);
|
|
||||||
// Set the chunk location
|
|
||||||
result.setChunk(new ChunkWrapper(worldInfo.getName(), chunkX, chunkZ));
|
|
||||||
// Set the result data
|
|
||||||
result.setChunkData(chunkData);
|
|
||||||
result.result = null;
|
|
||||||
|
|
||||||
// Catch any exceptions (as exceptions usually thrown)
|
|
||||||
try {
|
|
||||||
generate(BlockVector2.at(chunkX, chunkZ), worldInfo.getName(), result, false);
|
|
||||||
} catch (Throwable e) {
|
|
||||||
LOGGER.error("Error attempting to generate chunk.", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void generateSurface(
|
public void generateSurface(
|
||||||
@NotNull final WorldInfo worldInfo,
|
@NotNull final WorldInfo worldInfo,
|
||||||
@@ -277,11 +248,6 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
|
|||||||
return super.getBaseHeight(worldInfo, random, x, z, heightMap);
|
return super.getBaseHeight(worldInfo, random, x, z, heightMap);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* The entire method is deprecated, but kept for compatibility with versions lower than or equal to 1.16.2.
|
|
||||||
* The method will be removed in future versions, because WorldEdit and FastAsyncWorldEdit only support the latest point
|
|
||||||
* release.
|
|
||||||
*/
|
|
||||||
@SuppressWarnings("deprecation") // The entire method is deprecated, but kept for compatibility with <=1.16.2
|
@SuppressWarnings("deprecation") // The entire method is deprecated, but kept for compatibility with <=1.16.2
|
||||||
@Override
|
@Override
|
||||||
@Deprecated(since = "TODO")
|
@Deprecated(since = "TODO")
|
||||||
@@ -292,8 +258,8 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
|
|||||||
if (this.platformGenerator != this) {
|
if (this.platformGenerator != this) {
|
||||||
return this.platformGenerator.generateChunkData(world, random, x, z, biome);
|
return this.platformGenerator.generateChunkData(world, random, x, z, biome);
|
||||||
} else {
|
} else {
|
||||||
// Throw exception to be caught by the server that indicates the new generation API is being used.
|
// Return super as it will throw an exception caught by the server that will mean this method is no longer used.
|
||||||
throw new UnsupportedOperationException("Using new generation methods. This method is unsupported.");
|
return super.generateChunkData(world, random, x, z, biome);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4,8 +4,8 @@ guice = "5.1.0"
|
|||||||
spotbugs = "4.7.3"
|
spotbugs = "4.7.3"
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
worldedit = "7.2.14"
|
worldedit = "7.2.13"
|
||||||
placeholderapi = "2.11.3"
|
placeholderapi = "2.11.2"
|
||||||
luckperms = "5.4"
|
luckperms = "5.4"
|
||||||
essentialsx = "2.19.7"
|
essentialsx = "2.19.7"
|
||||||
mvdwapi = "3.1.1"
|
mvdwapi = "3.1.1"
|
||||||
@@ -13,14 +13,14 @@ mvdwapi = "3.1.1"
|
|||||||
# Third party
|
# Third party
|
||||||
prtree = "2.0.1"
|
prtree = "2.0.1"
|
||||||
aopalliance = "1.0"
|
aopalliance = "1.0"
|
||||||
cloud-services = "1.8.3"
|
cloud-services = "1.8.2"
|
||||||
arkitektonika = "2.1.2"
|
arkitektonika = "2.1.2"
|
||||||
squirrelid = "0.3.2"
|
squirrelid = "0.3.1"
|
||||||
|
|
||||||
# Gradle plugins
|
# Gradle plugins
|
||||||
shadow = "7.1.2"
|
shadow = "7.1.2"
|
||||||
grgit = "4.1.1"
|
grgit = "4.1.1"
|
||||||
spotless = "6.17.0"
|
spotless = "6.16.0"
|
||||||
nexus = "1.3.0"
|
nexus = "1.3.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
Reference in New Issue
Block a user