Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-09-24 21:02:48 +02:00
Code Issues Projects Releases Wiki Activity

Added an isChanged() method to Island

Browse Source 
The island will only be saved if isChanged() is true. It is set to true
if any setter is used or a field is changed.

This should help servers shutdown a lot faster and background database
saves go quicker. Only applies to Islands!

https://github.com/BentoBoxWorld/BentoBox/issues/1629
This commit is contained in:
tastybento 2021-01-08 20:55:43 -08:00
parent 2701eb92d7
commit 7e52a5f641
2 changed files with 112 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
src/main/java/world/bentobox/bentobox/database/objects/Island.java
View File

@ -59,6 +59,11 @@ import world.bentobox.bentobox.util.Util;
@Table(name = "Islands") @Table(name = "Islands")
public class Island implements DataObject, MetaDataAble { public class Island implements DataObject, MetaDataAble {
/**
* Set to true if this data object has been changed since being loaded from the database
*/
private boolean changed;
// True if this island is deleted and pending deletion from the database // True if this island is deleted and pending deletion from the database
@Expose @Expose
private boolean deleted = false; private boolean deleted = false;
@ -197,6 +202,7 @@ public class Island implements DataObject, MetaDataAble {
range = BentoBox.getInstance().getIWM().getIslandDistance(world); range = BentoBox.getInstance().getIWM().getIslandDistance(world);
this.protectionRange = protectionRange; this.protectionRange = protectionRange;
this.maxEverProtectionRange = protectionRange; this.maxEverProtectionRange = protectionRange;
this.setChanged();
} }
/** /**
@ -206,6 +212,15 @@ public class Island implements DataObject, MetaDataAble {
public Island(Island island) { public Island(Island island) {
this.center = island.getCenter().clone(); this.center = island.getCenter().clone();
this.createdDate = island.getCreatedDate(); this.createdDate = island.getCreatedDate();
Optional.ofNullable(island.getCommandRanks()).ifPresent(cr -> {
this.commandRanks = new HashMap<>();
this.commandRanks.putAll(cr);
});
Optional.ofNullable(island.getCooldowns()).ifPresent(c -> {
this.cooldowns = new HashMap<>();
this.cooldowns.putAll(c);
});
this.createdDate = island.getCreatedDate();
this.deleted = island.isDeleted(); this.deleted = island.isDeleted();
this.doNotLoad = island.isDoNotLoad(); this.doNotLoad = island.isDoNotLoad();
this.flags.putAll(island.getFlags()); this.flags.putAll(island.getFlags());
@ -214,19 +229,22 @@ public class Island implements DataObject, MetaDataAble {
this.levelHandicap = island.getLevelHandicap(); this.levelHandicap = island.getLevelHandicap();
this.maxEverProtectionRange = island.getMaxEverProtectionRange(); this.maxEverProtectionRange = island.getMaxEverProtectionRange();
this.members.putAll(island.getMembers()); this.members.putAll(island.getMembers());
island.getMetaData().ifPresent(m -> {
this.metaData = new HashMap<>();
this.metaData.putAll(m);
});
this.name = island.getName(); this.name = island.getName();
this.owner = island.getOwner(); this.owner = island.getOwner();
this.protectionRange = island.getProtectionRange(); this.protectionRange = island.getProtectionRange();
this.purgeProtected = island.getPurgeProtected(); this.purgeProtected = island.getPurgeProtected();
this.range = island.getRange(); this.range = island.getRange();
this.reserved = island.isReserved();
this.spawn = island.isSpawn(); this.spawn = island.isSpawn();
island.getSpawnPoint().forEach((k,v) -> island.spawnPoint.put(k, v.clone())); island.getSpawnPoint().forEach((k,v) -> island.spawnPoint.put(k, v.clone()));
this.uniqueId = island.getUniqueId(); this.uniqueId = island.getUniqueId();
this.updatedDate = island.getUpdatedDate(); this.updatedDate = island.getUpdatedDate();
this.world = island.getWorld(); this.world = island.getWorld();
this.cooldowns = island.getCooldowns(); this.setChanged();
this.commandRanks = island.getCommandRanks();
this.reserved = island.isReserved();
} }
/* /*
@ -239,6 +257,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void addMember(@NonNull UUID playerUUID) { public void addMember(@NonNull UUID playerUUID) {
setRank(playerUUID, RanksManager.MEMBER_RANK); setRank(playerUUID, RanksManager.MEMBER_RANK);
setChanged();
} }
/** /**
@ -254,6 +273,7 @@ public class Island implements DataObject, MetaDataAble {
public boolean ban(@NonNull UUID issuer, @NonNull UUID target) { public boolean ban(@NonNull UUID issuer, @NonNull UUID target) {
setRank(target, RanksManager.BANNED_RANK); setRank(target, RanksManager.BANNED_RANK);
log(new LogEntry.Builder("BAN").data("player", target.toString()).data("issuer", issuer.toString()).build()); log(new LogEntry.Builder("BAN").data("player", target.toString()).data("issuer", issuer.toString()).build());
setChanged();
return true; return true;
} }
@ -506,6 +526,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setMaxEverProtectionRange(int maxEverProtectionRange) { public void setMaxEverProtectionRange(int maxEverProtectionRange) {
this.maxEverProtectionRange = maxEverProtectionRange; this.maxEverProtectionRange = maxEverProtectionRange;
setChanged();
} }
/** /**
@ -733,6 +754,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void removeMember(UUID playerUUID) { public void removeMember(UUID playerUUID) {
members.remove(playerUUID); members.remove(playerUUID);
setChanged();
} }
/** /**
@ -743,6 +765,7 @@ public class Island implements DataObject, MetaDataAble {
this.world = center.getWorld(); this.world = center.getWorld();
} }
this.center = center; this.center = center;
setChanged();
} }
/** /**
@ -750,6 +773,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setCreatedDate(long createdDate){ public void setCreatedDate(long createdDate){
this.createdDate = createdDate; this.createdDate = createdDate;
setChanged();
} }
/** /**
@ -759,6 +783,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setFlag(Flag flag, int value){ public void setFlag(Flag flag, int value){
flags.put(flag, value); flags.put(flag, value);
setChanged();
} }
/** /**
@ -766,6 +791,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setFlags(Map<Flag, Integer> flags) { public void setFlags(Map<Flag, Integer> flags) {
this.flags = flags; this.flags = flags;
setChanged();
} }
/** /**
@ -780,6 +806,7 @@ public class Island implements DataObject, MetaDataAble {
plugin.getFlagsManager().getFlags().stream().filter(f -> f.getType().equals(Flag.Type.SETTING)) plugin.getFlagsManager().getFlags().stream().filter(f -> f.getType().equals(Flag.Type.SETTING))
.forEach(f -> result.put(f, plugin.getIWM().getDefaultIslandSettings(world).getOrDefault(f, f.getDefaultRank()))); .forEach(f -> result.put(f, plugin.getIWM().getDefaultIslandSettings(world).getOrDefault(f, f.getDefaultRank())));
this.setFlags(result); this.setFlags(result);
setChanged();
} }
/** /**
@ -787,6 +814,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setLevelHandicap(int levelHandicap) { public void setLevelHandicap(int levelHandicap) {
this.levelHandicap = levelHandicap; this.levelHandicap = levelHandicap;
setChanged();
} }
/** /**
@ -794,6 +822,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setMembers(Map<UUID, Integer> members) { public void setMembers(Map<UUID, Integer> members) {
this.members = members; this.members = members;
setChanged();
} }
/** /**
@ -804,6 +833,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setName(String name){ public void setName(String name){
this.name = (name != null && !name.equals("")) ? name : null; this.name = (name != null && !name.equals("")) ? name : null;
setChanged();
} }
/** /**
@ -827,6 +857,7 @@ public class Island implements DataObject, MetaDataAble {
} }
} }
setRank(owner, RanksManager.OWNER_RANK); setRank(owner, RanksManager.OWNER_RANK);
setChanged();
} }
/** /**
@ -838,6 +869,7 @@ public class Island implements DataObject, MetaDataAble {
if (protectionRange > this.maxEverProtectionRange) { if (protectionRange > this.maxEverProtectionRange) {
this.maxEverProtectionRange = protectionRange; this.maxEverProtectionRange = protectionRange;
} }
setChanged();
} }
/** /**
@ -845,6 +877,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setPurgeProtected(boolean purgeProtected){ public void setPurgeProtected(boolean purgeProtected){
this.purgeProtected = purgeProtected; this.purgeProtected = purgeProtected;
setChanged();
} }
/** /**
@ -859,6 +892,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setRange(int range){ public void setRange(int range){
this.range = range; this.range = range;
setChanged();
} }
/** /**
@ -868,6 +902,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setRank(User user, int rank) { public void setRank(User user, int rank) {
setRank(user.getUniqueId(), rank); setRank(user.getUniqueId(), rank);
setChanged();
} }
/** /**
@ -877,11 +912,12 @@ public class Island implements DataObject, MetaDataAble {
* @param rank rank value * @param rank rank value
* @since 1.1 * @since 1.1
*/ */
public void setRank(UUID uuid, int rank) { public void setRank(@Nullable UUID uuid, int rank) {
if (uuid == null) { if (uuid == null) {
return; // Defensive code return; // Defensive code
} }
members.put(uuid, rank); members.put(uuid, rank);
setChanged();
} }
/** /**
@ -889,6 +925,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setRanks(Map<UUID, Integer> ranks) { public void setRanks(Map<UUID, Integer> ranks) {
members = ranks; members = ranks;
setChanged();
} }
/** /**
@ -911,6 +948,7 @@ public class Island implements DataObject, MetaDataAble {
setFlag(Flags.LOCK, RanksManager.VISITOR_RANK); setFlag(Flags.LOCK, RanksManager.VISITOR_RANK);
} }
log(new LogEntry.Builder("SPAWN").data("value", String.valueOf(isSpawn)).build()); log(new LogEntry.Builder("SPAWN").data("value", String.valueOf(isSpawn)).build());
setChanged();
} }
/** /**
@ -928,11 +966,13 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setSpawnPoint(Map<Environment, Location> spawnPoint) { public void setSpawnPoint(Map<Environment, Location> spawnPoint) {
this.spawnPoint = spawnPoint; this.spawnPoint = spawnPoint;
setChanged();
} }
@Override @Override
public void setUniqueId(String uniqueId) { public void setUniqueId(String uniqueId) {
this.uniqueId = uniqueId; this.uniqueId = uniqueId;
setChanged();
} }
/** /**
@ -940,6 +980,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setUpdatedDate(long updatedDate){ public void setUpdatedDate(long updatedDate){
this.updatedDate = updatedDate; this.updatedDate = updatedDate;
setChanged();
} }
/** /**
@ -947,6 +988,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setWorld(World world) { public void setWorld(World world) {
this.world = world; this.world = world;
setChanged();
} }
/** /**
@ -957,43 +999,42 @@ public class Island implements DataObject, MetaDataAble {
public boolean showInfo(User user) { public boolean showInfo(User user) {
BentoBox plugin = BentoBox.getInstance(); BentoBox plugin = BentoBox.getInstance();
user.sendMessage("commands.admin.info.title"); user.sendMessage("commands.admin.info.title");
user.sendMessage("commands.admin.info.island-uuid", "[uuid]", uniqueId); user.sendMessage("commands.admin.info.island-uuid", "[uuid]", this.getUniqueId());
if (owner == null) { if (getOwner() == null) {
user.sendMessage("commands.admin.info.unowned"); user.sendMessage("commands.admin.info.unowned");
} else { } else {
user.sendMessage("commands.admin.info.owner", "[owner]", plugin.getPlayers().getName(owner), "[uuid]", owner.toString()); user.sendMessage("commands.admin.info.owner", "[owner]", plugin.getPlayers().getName(getOwner()), "[uuid]", getOwner().toString());
// Fixes #getLastPlayed() returning 0 when it is the owner's first connection. // Fixes #getLastPlayed() returning 0 when it is the owner's first connection.
long lastPlayed = (Bukkit.getServer().getOfflinePlayer(owner).getLastPlayed() != 0) ? long lastPlayed = (Bukkit.getServer().getOfflinePlayer(getOwner()).getLastPlayed() != 0) ?
Bukkit.getServer().getOfflinePlayer(owner).getLastPlayed() : Bukkit.getServer().getOfflinePlayer(owner).getFirstPlayed(); Bukkit.getServer().getOfflinePlayer(getOwner()).getLastPlayed() : Bukkit.getServer().getOfflinePlayer(getOwner()).getFirstPlayed();
user.sendMessage("commands.admin.info.last-login","[date]", new Date(lastPlayed).toString()); user.sendMessage("commands.admin.info.last-login","[date]", new Date(lastPlayed).toString());
user.sendMessage("commands.admin.info.deaths", "[number]", String.valueOf(plugin.getPlayers().getDeaths(world, owner))); user.sendMessage("commands.admin.info.deaths", "[number]", String.valueOf(plugin.getPlayers().getDeaths(getWorld(), getOwner())));
String resets = String.valueOf(plugin.getPlayers().getResets(world, owner)); String resets = String.valueOf(plugin.getPlayers().getResets(getWorld(), getOwner()));
String total = plugin.getIWM().getResetLimit(world) < 0 ? "Unlimited" : String.valueOf(plugin.getIWM().getResetLimit(world)); String total = plugin.getIWM().getResetLimit(getWorld()) < 0 ? "Unlimited" : String.valueOf(plugin.getIWM().getResetLimit(getWorld()));
user.sendMessage("commands.admin.info.resets-left", "[number]", resets, "[total]", total); user.sendMessage("commands.admin.info.resets-left", "[number]", resets, "[total]", total);
// Show team members // Show team members
showMembers(user); showMembers(user);
} }
Vector location = center.toVector(); Vector location = getCenter().toVector();
user.sendMessage("commands.admin.info.island-location", "[xyz]", Util.xyz(location)); user.sendMessage("commands.admin.info.island-location", "[xyz]", Util.xyz(location));
Vector from = center.toVector().subtract(new Vector(range, 0, range)).setY(0); Vector from = getCenter().toVector().subtract(new Vector(getRange(), 0, getRange())).setY(0);
Vector to = center.toVector().add(new Vector(range-1, 0, range-1)).setY(center.getWorld().getMaxHeight()); Vector to = getCenter().toVector().add(new Vector(getRange()-1, 0, getRange()-1)).setY(getCenter().getWorld().getMaxHeight());
user.sendMessage("commands.admin.info.island-coords", "[xz1]", Util.xyz(from), "[xz2]", Util.xyz(to)); user.sendMessage("commands.admin.info.island-coords", "[xz1]", Util.xyz(from), "[xz2]", Util.xyz(to));
user.sendMessage("commands.admin.info.protection-range", "[range]", String.valueOf(protectionRange)); user.sendMessage("commands.admin.info.protection-range", "[range]", String.valueOf(getProtectionRange()));
user.sendMessage("commands.admin.info.max-protection-range", "[range]", String.valueOf(maxEverProtectionRange)); user.sendMessage("commands.admin.info.max-protection-range", "[range]", String.valueOf(getMaxEverProtectionRange()));
Vector pfrom = center.toVector().subtract(new Vector(protectionRange, 0, protectionRange)).setY(0); Vector pfrom = getCenter().toVector().subtract(new Vector(getProtectionRange(), 0, getProtectionRange())).setY(0);
Vector pto = center.toVector().add(new Vector(protectionRange-1, 0, protectionRange-1)).setY(center.getWorld().getMaxHeight()); Vector pto = getCenter().toVector().add(new Vector(getProtectionRange()-1, 0, getProtectionRange()-1)).setY(getCenter().getWorld().getMaxHeight());
user.sendMessage("commands.admin.info.protection-coords", "[xz1]", Util.xyz(pfrom), "[xz2]", Util.xyz(pto)); user.sendMessage("commands.admin.info.protection-coords", "[xz1]", Util.xyz(pfrom), "[xz2]", Util.xyz(pto));
if (spawn) { if (spawn) {
user.sendMessage("commands.admin.info.is-spawn"); user.sendMessage("commands.admin.info.is-spawn");
} }
Set<UUID> banned = getBanned(); if (!getBanned().isEmpty()) {
if (!banned.isEmpty()) {
user.sendMessage("commands.admin.info.banned-players"); user.sendMessage("commands.admin.info.banned-players");
banned.forEach(u -> user.sendMessage("commands.admin.info.banned-format", TextVariables.NAME, plugin.getPlayers().getName(u))); getBanned().forEach(u -> user.sendMessage("commands.admin.info.banned-format", TextVariables.NAME, plugin.getPlayers().getName(u)));
} }
if (purgeProtected) { if (getPurgeProtected()) {
user.sendMessage("commands.admin.info.purge-protected"); user.sendMessage("commands.admin.info.purge-protected");
} }
return true; return true;
@ -1025,6 +1066,7 @@ public class Island implements DataObject, MetaDataAble {
if (flag.getType().equals(Flag.Type.SETTING) || flag.getType().equals(Flag.Type.WORLD_SETTING)) { if (flag.getType().equals(Flag.Type.SETTING) || flag.getType().equals(Flag.Type.WORLD_SETTING)) {
setSettingsFlag(flag, !isAllowed(flag)); setSettingsFlag(flag, !isAllowed(flag));
} }
setChanged();
} }
/** /**
@ -1036,6 +1078,7 @@ public class Island implements DataObject, MetaDataAble {
if (flag.getType().equals(Flag.Type.SETTING) || flag.getType().equals(Flag.Type.WORLD_SETTING)) { if (flag.getType().equals(Flag.Type.SETTING) || flag.getType().equals(Flag.Type.WORLD_SETTING)) {
flags.put(flag, state ? 1 : -1); flags.put(flag, state ? 1 : -1);
} }
setChanged();
} }
/** /**
@ -1045,6 +1088,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setSpawnPoint(Environment islandType, Location l) { public void setSpawnPoint(Environment islandType, Location l) {
spawnPoint.put(islandType, l); spawnPoint.put(islandType, l);
setChanged();
} }
/** /**
@ -1063,6 +1107,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void removeRank(Integer rank) { public void removeRank(Integer rank) {
members.values().removeIf(rank::equals); members.values().removeIf(rank::equals);
setChanged();
} }
/** /**
@ -1079,6 +1124,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void log(LogEntry logEntry) { public void log(LogEntry logEntry) {
history.add(logEntry); history.add(logEntry);
setChanged();
} }
/** /**
@ -1087,6 +1133,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setHistory(List<LogEntry> history) { public void setHistory(List<LogEntry> history) {
this.history = history; this.history = history;
setChanged();
} }
/** /**
@ -1101,6 +1148,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setDoNotLoad(boolean doNotLoad) { public void setDoNotLoad(boolean doNotLoad) {
this.doNotLoad = doNotLoad; this.doNotLoad = doNotLoad;
setChanged();
} }
/** /**
@ -1115,6 +1163,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setDeleted(boolean deleted) { public void setDeleted(boolean deleted) {
this.deleted = deleted; this.deleted = deleted;
setChanged();
} }
/** /**
@ -1133,6 +1182,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setGameMode(String gameMode) { public void setGameMode(String gameMode) {
this.gameMode = gameMode; this.gameMode = gameMode;
setChanged();
} }
/** /**
@ -1171,6 +1221,7 @@ public class Island implements DataObject, MetaDataAble {
return true; return true;
} }
cooldowns.remove(flag); cooldowns.remove(flag);
setChanged();
return false; return false;
} }
@ -1180,6 +1231,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setCooldown(Flag flag) { public void setCooldown(Flag flag) {
cooldowns.put(flag, flag.getCooldown() * 1000 + System.currentTimeMillis()); cooldowns.put(flag, flag.getCooldown() * 1000 + System.currentTimeMillis());
setChanged();
} }
/** /**
@ -1194,6 +1246,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setCooldowns(Map<Flag, Long> cooldowns) { public void setCooldowns(Map<Flag, Long> cooldowns) {
this.cooldowns = cooldowns; this.cooldowns = cooldowns;
setChanged();
} }
/** /**
@ -1208,6 +1261,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setCommandRanks(Map<String, Integer> commandRanks) { public void setCommandRanks(Map<String, Integer> commandRanks) {
this.commandRanks = commandRanks; this.commandRanks = commandRanks;
setChanged();
} }
/** /**
@ -1228,6 +1282,7 @@ public class Island implements DataObject, MetaDataAble {
public void setRankCommand(String command, int rank) { public void setRankCommand(String command, int rank) {
if (this.commandRanks == null) this.commandRanks = new HashMap<>(); if (this.commandRanks == null) this.commandRanks = new HashMap<>();
this.commandRanks.put(command, rank); this.commandRanks.put(command, rank);
setChanged();
} }
/** /**
@ -1246,6 +1301,7 @@ public class Island implements DataObject, MetaDataAble {
*/ */
public void setReserved(boolean reserved) { public void setReserved(boolean reserved) {
this.reserved = reserved; this.reserved = reserved;
setChanged();
} }
/** /**
@ -1267,6 +1323,7 @@ public class Island implements DataObject, MetaDataAble {
@Override @Override
public void setMetaData(Map<String, MetaDataValue> metaData) { public void setMetaData(Map<String, MetaDataValue> metaData) {
this.metaData = metaData; this.metaData = metaData;
setChanged();
} }
@Override @Override
@ -1288,5 +1345,20 @@ public class Island implements DataObject, MetaDataAble {
+ (metaData != null ? "metaData=" + metaData : "") + "]"; + (metaData != null ? "metaData=" + metaData : "") + "]";
} }
/**
* @return changed state
*/
public boolean isChanged() {
return changed;
}
/**
* Indicates the class has been changed
*/
public void setChanged() {
this.changed = true;
}
} }

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

@ -1241,11 +1241,13 @@ public class IslandsManager {
*/ */
public void saveAll(boolean schedule){ public void saveAll(boolean schedule){
if (!schedule) { if (!schedule) {
for(Island island : islandCache.getIslands()){ for(Island island : islandCache.getIslands()) {
try { if (island.isChanged()) {
handler.saveObjectAsync(island); try {
} catch (Exception e) { handler.saveObjectAsync(island);
plugin.logError("Could not save island to database when running sync! " + e.getMessage()); } catch (Exception e) {
plugin.logError("Could not save island to database when running sync! " + e.getMessage());
}
} }
} }
return; return;
@ -1264,10 +1266,12 @@ public class IslandsManager {
cancel(); cancel();
return; return;
} }
try { if (island.isChanged()) {
handler.saveObjectAsync(island); try {
} catch (Exception e) { handler.saveObjectAsync(island);
plugin.logError("Could not save island to database when running sync! " + e.getMessage()); } catch (Exception e) {
plugin.logError("Could not save island to database when running sync! " + e.getMessage());
}
} }
} }
} }
@ -1302,10 +1306,14 @@ public class IslandsManager {
} }
public void shutdown(){ public void shutdown(){
plugin.log("Removing coops from islands...");
// Remove all coop associations // Remove all coop associations
islandCache.getIslands().forEach(i -> i.getMembers().values().removeIf(p -> p == RanksManager.COOP_RANK)); islandCache.getIslands().forEach(i -> i.getMembers().values().removeIf(p -> p == RanksManager.COOP_RANK));
plugin.log("Saving islands - this has to be done sync so it may take a while with a lot of islands...");
saveAll(); saveAll();
plugin.log("Islands saved.");
islandCache.clear(); islandCache.clear();
plugin.log("Closing database.");
handler.close(); handler.close();
} }