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

Switch to timer-based chunk deletion

Browse Source
This commit is contained in:
tastybento 2019-01-12 10:31:25 -08:00
parent b51178518a
commit 7c1e195eaf
4 changed files with 213 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/world/bentobox/bentobox/database/Database.java
View File

@ -109,7 +109,7 @@ public class Database<T> {
handler.deleteObject(object);
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException
| IntrospectionException e) {
logger.severe(() -> "Could not delete config! Error: " + e.getMessage());
logger.severe(() -> "Could not delete object! Error: " + e.getMessage());
}
}

172
src/main/java/world/bentobox/bentobox/database/objects/DeletedIslandDO.java Normal file
View File

@ -0,0 +1,172 @@
package world.bentobox.bentobox.database.objects;
import org.bukkit.Location;
import org.bukkit.World;
import com.google.gson.annotations.Expose;
import world.bentobox.bentobox.util.Util;
/**
* Data object to store islands in deletion
*
*/
public class DeletedIslandDO implements DataObject {
@Expose
private String uniqueId = "";
@Expose
private World world;
@Expose
private int minXChunk;
@Expose
private int maxXChunk;
@Expose
private int minZChunk;
@Expose
private int maxZChunk;
public DeletedIslandDO() {}
public DeletedIslandDO(Location location, int minXChunk, int maxXChunk, int minZChunk, int maxZChunk) {
this.uniqueId = Util.getStringLocation(location);
this.world = location.getWorld();
this.minXChunk = minXChunk;
this.maxXChunk = maxXChunk;
this.minZChunk = minZChunk;
this.maxZChunk = maxZChunk;
}
public DeletedIslandDO(Island island) {
uniqueId = Util.getStringLocation(island.getCenter());
world = island.getCenter().getWorld();
minXChunk = island.getMinX() >> 4;
maxXChunk = (island.getRange() * 2 + island.getMinX() - 1) >> 4;
minZChunk = island.getMinZ() >> 4;
maxZChunk = (island.getRange() * 2 + island.getMinZ() - 1) >> 4;
}
@Override
public String getUniqueId() {
return uniqueId;
}
@Override
public void setUniqueId(String uniqueId) {
this.uniqueId = uniqueId;
}
/**
* @return the world
*/
public World getWorld() {
return world;
}
/**
* @return the minXChunk
*/
public int getMinXChunk() {
return minXChunk;
}
/**
* @return the maxXChunk
*/
public int getMaxXChunk() {
return maxXChunk;
}
/**
* @return the minZChunk
*/
public int getMinZChunk() {
return minZChunk;
}
/**
* @return the maxZChunk
*/
public int getMaxZChunk() {
return maxZChunk;
}
/**
* @param world the world to set
*/
public void setWorld(World world) {
this.world = world;
}
/**
* @param minXChunk the minXChunk to set
*/
public void setMinXChunk(int minXChunk) {
this.minXChunk = minXChunk;
}
/**
* @param maxXChunk the maxXChunk to set
*/
public void setMaxXChunk(int maxXChunk) {
this.maxXChunk = maxXChunk;
}
/**
* @param minZChunk the minZChunk to set
*/
public void setMinZChunk(int minZChunk) {
this.minZChunk = minZChunk;
}
/**
* @param maxZChunk the maxZChunk to set
*/
public void setMaxZChunk(int maxZChunk) {
this.maxZChunk = maxZChunk;
}
/* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((uniqueId == null) ? 0 : uniqueId.hashCode());
return result;
}
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (!(obj instanceof DeletedIslandDO)) {
return false;
}
DeletedIslandDO other = (DeletedIslandDO) obj;
if (uniqueId == null) {
if (other.uniqueId != null) {
return false;
}
} else if (!uniqueId.equals(other.uniqueId)) {
return false;
}
return true;
}
}

11
src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
View File

@ -24,9 +24,13 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.util.Vector;
import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.events.IslandBaseEvent;
import world.bentobox.bentobox.api.events.island.IslandEvent;
import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
import world.bentobox.bentobox.api.localization.TextVariables;
import world.bentobox.bentobox.api.user.User;
import world.bentobox.bentobox.database.Database;
import world.bentobox.bentobox.database.objects.DeletedIslandDO;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.lists.Flags;
import world.bentobox.bentobox.managers.island.IslandCache;
@ -244,6 +248,11 @@ public class IslandsManager {
if (island == null) {
return;
}
// Fire event
IslandBaseEvent event = IslandEvent.builder().island(island).reason(Reason.DELETE).build();
if (event.isCancelled()) {
return;
}
// Set the owner of the island to no one.
island.setOwner(null);
island.setFlag(Flags.LOCK, RanksManager.VISITOR_RANK);
@ -255,7 +264,7 @@ public class IslandsManager {
// Remove players from island
removePlayersFromIsland(island);
// Remove blocks from world
new DeleteIslandChunks(plugin, island);
new DeleteIslandChunks(plugin, new DeletedIslandDO(island));
}
}

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

@ -1,12 +1,12 @@
package world.bentobox.bentobox.util;
import org.bukkit.World;
import org.bukkit.Bukkit;
import org.bukkit.scheduler.BukkitTask;
import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.events.IslandBaseEvent;
import world.bentobox.bentobox.api.events.island.IslandEvent;
import world.bentobox.bentobox.api.events.island.IslandEvent.Reason;
import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.database.objects.DeletedIslandDO;
/**
* Deletes islands fast using chunk regeneration
@ -16,42 +16,34 @@ import world.bentobox.bentobox.database.objects.Island;
*/
public class DeleteIslandChunks {
/**
* Deletes the island
* @param plugin - plugin object
* @param island - island to delete
*/
private int x;
private int z;
private BukkitTask task;
@SuppressWarnings("deprecation")
public DeleteIslandChunks(final BentoBox plugin, final Island island) {
// Fire event
IslandBaseEvent event = IslandEvent.builder().island(island).reason(Reason.DELETE).build();
if (event.isCancelled()) {
return;
}
final World world = island.getCenter().getWorld();
if (world == null) {
return;
}
int minXChunk = island.getMinX() >> 4;
int maxXChunk = (island.getRange() * 2 + island.getMinX() - 1) >> 4;
int minZChunk = island.getMinZ() >> 4;
int maxZChunk = (island.getRange() * 2 + island.getMinZ() - 1) >> 4;
for (int x = minXChunk; x <= maxXChunk; x++) {
for (int z = minZChunk; z<=maxZChunk; z++) {
world.regenerateChunk(x, z);
public DeleteIslandChunks(BentoBox plugin, DeletedIslandDO di) {
x = di.getMinXChunk();
z = di.getMinZChunk();
task = Bukkit.getScheduler().runTaskTimer(plugin, () -> {
di.getWorld().regenerateChunk(x, z);
//System.out.println("regenerating = " + x + "," + z);
if (plugin.getIWM().isNetherGenerate(world) && plugin.getIWM().isNetherIslands(world)) {
plugin.getIWM().getNetherWorld(world).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(world) && plugin.getIWM().isEndIslands(world)) {
plugin.getIWM().getEndWorld(world).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()) {
task.cancel();
// Fire event
IslandEvent.builder().island(island).reason(Reason.DELETED).build();
IslandEvent.builder().location(Util.getLocationString(di.getUniqueId())).reason(Reason.DELETED).build();
}
}
}, 0L, 1L);
}}