Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-11-27 21:27:44 +01:00
Code Issues Projects Releases Wiki Activity

Makes GameModes responsible for regenerating chunks.

Browse Source
This commit is contained in:
tastybento 2019-04-29 16:37:46 -07:00
parent 661bffad44
commit bceb0e1c07
2 changed files with 48 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java
View File

@ -2,6 +2,7 @@ package world.bentobox.bentobox.api.addons;
import java.util.Optional;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.generator.ChunkGenerator;
@ -129,4 +130,11 @@ public abstract class GameModeAddon extends Addon {
* @since 1.4.0
*/
public abstract void saveWorldSettings();
/**
* When called, the game mode must regenerate the chunk to its original state.
* Used when an island is deleted.
* @param chunk - chunk to regenerate
*/
public abstract void regerateChunk(Chunk chunk);
}

78
src/main/java/world/bentobox/bentobox/util/DeleteIslandChunks.java
View File

@ -15,43 +15,45 @@ import world.bentobox.bentobox.database.objects.IslandDeletion;
*/
public class DeleteIslandChunks {
/**
* This is how many chunks per world will be done in one tick.
*/
private static final int SPEED = 5;
private int x;
private int z;
private BukkitTask task;
/**
* This is how many chunks per world will be done in one tick.
*/
private static final int SPEED = 5;
private int x;
private int z;
private BukkitTask task;
@SuppressWarnings({"deprecation", "squid:CallToDeprecatedMethod"})
public DeleteIslandChunks(BentoBox plugin, IslandDeletion di) {
// Fire event
IslandEvent.builder().deletedIslandInfo(di).reason(Reason.DELETE_CHUNKS).build();
x = di.getMinXChunk();
z = di.getMinZChunk();
// Run through all chunks of the islands and regenerate them.
task = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
for (int i = 0; i < SPEED; i++) {
// World#regenerateChunk(int, int) from Bukkit is deprecated because it may not regenerate decoration correctly
di.getWorld().regenerateChunk(x, z);
if (plugin.getIWM().isNetherGenerate(di.getWorld()) && plugin.getIWM().isNetherIslands(di.getWorld())) {
plugin.getIWM().getNetherWorld(di.getWorld()).regenerateChunk(x, z);
}
if (plugin.getIWM().isEndGenerate(di.getWorld()) && plugin.getIWM().isEndIslands(di.getWorld())) {
plugin.getIWM().getEndWorld(di.getWorld()).regenerateChunk(x, z);
}
z++;
if (z > di.getMaxZChunk()) {
z = di.getMinZChunk();
x++;
if (x > di.getMaxXChunk()) {
// We're done
task.cancel();
// Fire event
IslandEvent.builder().deletedIslandInfo(di).reason(Reason.DELETED).build();
}
}
}
}, 0L, 1L);
}
public DeleteIslandChunks(BentoBox plugin, IslandDeletion di) {
// Fire event
IslandEvent.builder().deletedIslandInfo(di).reason(Reason.DELETE_CHUNKS).build();
x = di.getMinXChunk();
z = di.getMinZChunk();
// Run through all chunks of the islands and regenerate them.
task = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
for (int i = 0; i < SPEED; i++) {
plugin.getIWM().getAddon(di.getWorld()).ifPresent(gm -> {
gm.regerateChunk(di.getWorld().getChunkAt(x, z));
if (plugin.getIWM().isNetherGenerate(di.getWorld()) && plugin.getIWM().isNetherIslands(di.getWorld())) {
gm.regerateChunk(gm.getNetherWorld().getChunkAt(x, z));
}
if (plugin.getIWM().isEndGenerate(di.getWorld()) && plugin.getIWM().isEndIslands(di.getWorld())) {
gm.regerateChunk(gm.getEndWorld().getChunkAt(x, z));
}
z++;
if (z > di.getMaxZChunk()) {
z = di.getMinZChunk();
x++;
if (x > di.getMaxXChunk()) {
// We're done
task.cancel();
// Fire event
IslandEvent.builder().deletedIslandInfo(di).reason(Reason.DELETED).build();
}
}
});
}
}, 0L, 1L);
}
}