EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-07-23 23:55:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v7' into feature/v7/new-generation-api

Browse Source 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
This commit is contained in:
dordsor21
2022-06-11 14:12:32 +01:00
parent cdc8cdc497 60f7113105
commit 666a60a1c7
5 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java
View File

@@ -150,7 +150,11 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
}
// Extracted to synchronized method for thread-safety, preventing multiple internal world load calls
private synchronized void checkLoaded(World world) {
private synchronized void checkLoaded(@NonNull World world) {
// Do not attempt to load configurations until WorldEdit has a platform ready.
if (!PlotSquared.get().isWeInitialised()) {
return;
}
if (!this.loaded) {
String name = world.getName();
PlotSquared.get().loadWorld(name, this);
@@ -172,11 +176,11 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
}
@SuppressWarnings("deprecation") // Kept for compatibility with <=1.17.1
private void setSpawnLimits(World world, int spawnLimit) {
world.setAmbientSpawnLimit(spawnLimit);
world.setAnimalSpawnLimit(spawnLimit);
world.setMonsterSpawnLimit(spawnLimit);
world.setWaterAnimalSpawnLimit(spawnLimit);
private void setSpawnLimits(@NonNull World world, int limit) {
world.setAmbientSpawnLimit(limit);
world.setAnimalSpawnLimit(limit);
world.setMonsterSpawnLimit(limit);
world.setWaterAnimalSpawnLimit(limit);
}
@Override
@@ -323,6 +327,11 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
}
private void generate(BlockVector2 loc, String world, ZeroedDelegateScopedQueueCoordinator result, boolean biomes) {
if (!this.loaded) {
synchronized (this) {
PlotSquared.get().loadWorld(world, this);
}
}
// Process the chunk
if (ChunkManager.preProcessChunk(loc, result)) {
return;

2
Bukkit/src/main/java/com/plotsquared/bukkit/listener/EntityEventListener.java
View File

@@ -208,7 +208,7 @@ public class EntityEventListener implements Listener {
}
return;
}
if (BukkitEntityUtil.checkEntity(entity, plot)) {
if (BukkitEntityUtil.checkEntity(entity, plot.getBasePlot(false))) {
event.setCancelled(true);
}
}