mirror of
https://github.com/IntellectualSites/PlotSquared.git
synced 2025-07-30 19:15:27 +02:00
Compare commits
71 Commits
renovate/n
...
renovate/s
Author | SHA1 | Date | |
---|---|---|---|
![]() |
b3a7c3b7d9 | ||
![]() |
1464804c11 | ||
![]() |
8629eae5fc | ||
![]() |
7b8ba7c3ac | ||
![]() |
77c7466c17 | ||
![]() |
82fe76fd37 | ||
![]() |
3f81ea4ef8 | ||
![]() |
745b06a008 | ||
![]() |
77b2bd166a | ||
![]() |
8e02336c44 | ||
![]() |
3adfbde45a | ||
![]() |
e6db8e2750 | ||
![]() |
9cd0ee9b49 | ||
![]() |
d455d1fcd7 | ||
![]() |
89031447f2 | ||
![]() |
42e146b8c7 | ||
![]() |
a5fdcda673 | ||
![]() |
a5c53a96d1 | ||
![]() |
276e619caa | ||
![]() |
f636a5ec63 | ||
![]() |
785362c576 | ||
![]() |
1e7ba7d173 | ||
![]() |
aa784e98f8 | ||
![]() |
586474c8e6 | ||
![]() |
70b6636f50 | ||
![]() |
bd62d1a1c7 | ||
![]() |
26692d6633 | ||
![]() |
bb0f200429 | ||
![]() |
bed62edc02 | ||
![]() |
ee0f389c78 | ||
![]() |
5af8be4293 | ||
![]() |
cbacdd67eb | ||
![]() |
746028afbc | ||
![]() |
b79537ebbc | ||
![]() |
6efd581500 | ||
![]() |
1448d8d4af | ||
![]() |
8d9a387587 | ||
![]() |
0707aa47c9 | ||
![]() |
8c57d616cf | ||
![]() |
66660507e0 | ||
![]() |
a12490c3eb | ||
![]() |
36e5f36660 | ||
![]() |
350eae7813 | ||
![]() |
12dc198a86 | ||
![]() |
fb2533d66a | ||
![]() |
37d6dcc7ea | ||
![]() |
530fcc0fea | ||
![]() |
7135bdd6aa | ||
![]() |
3198c3b081 | ||
![]() |
7669e79da1 | ||
![]() |
c0bfa297bb | ||
![]() |
75fd9b2631 | ||
![]() |
6b680fb2c0 | ||
![]() |
27ffe4fcdc | ||
![]() |
8afcaccb8a | ||
![]() |
c83b13e374 | ||
![]() |
23360057b9 | ||
![]() |
60f7113105 | ||
![]() |
26c0c1b7cd | ||
![]() |
764c94c9cc | ||
![]() |
3d87ee41b3 | ||
![]() |
fd8832ac98 | ||
![]() |
228acc196c | ||
![]() |
62197f3deb | ||
![]() |
daa9348993 | ||
![]() |
7e4499e092 | ||
![]() |
396a1575d2 | ||
![]() |
953d57d1b5 | ||
![]() |
b53d2d03a4 | ||
![]() |
c1431c0971 | ||
![]() |
62ee60a76c |
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@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
|
uses: github/codeql-action/init@168b99b3c22180941ae7dbdd5f5c9678ede476ba # v2
|
||||||
with:
|
with:
|
||||||
languages: ${{ matrix.language }}
|
languages: ${{ matrix.language }}
|
||||||
- name: Autobuild
|
- name: Autobuild
|
||||||
uses: github/codeql-action/autobuild@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
|
uses: github/codeql-action/autobuild@168b99b3c22180941ae7dbdd5f5c9678ede476ba # v2
|
||||||
- name: Perform CodeQL Analysis
|
- name: Perform CodeQL Analysis
|
||||||
uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
|
uses: github/codeql-action/analyze@168b99b3c22180941ae7dbdd5f5c9678ede476ba # v2
|
||||||
|
@@ -185,6 +185,35 @@ 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,
|
||||||
@@ -248,6 +277,11 @@ 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")
|
||||||
@@ -258,8 +292,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 {
|
||||||
// Return super as it will throw an exception caught by the server that will mean this method is no longer used.
|
// Throw exception to be caught by the server that indicates the new generation API is being used.
|
||||||
return super.generateChunkData(world, random, x, z, biome);
|
throw new UnsupportedOperationException("Using new generation methods. This method is unsupported.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4,8 +4,8 @@ guice = "5.1.0"
|
|||||||
spotbugs = "4.7.3"
|
spotbugs = "4.7.3"
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
worldedit = "7.2.13"
|
worldedit = "7.2.14"
|
||||||
placeholderapi = "2.11.2"
|
placeholderapi = "2.11.3"
|
||||||
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.2"
|
cloud-services = "1.8.3"
|
||||||
arkitektonika = "2.1.2"
|
arkitektonika = "2.1.2"
|
||||||
squirrelid = "0.3.1"
|
squirrelid = "0.3.2"
|
||||||
|
|
||||||
# Gradle plugins
|
# Gradle plugins
|
||||||
shadow = "7.1.2"
|
shadow = "7.1.2"
|
||||||
grgit = "4.1.1"
|
grgit = "4.1.1"
|
||||||
spotless = "6.16.0"
|
spotless = "6.17.0"
|
||||||
nexus = "1.3.0"
|
nexus = "1.3.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
Reference in New Issue
Block a user