Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Perf: Claim Cleanup

Browse Source
This commit is contained in:
ryanhamshire 2014-11-16 14:48:03 -08:00
parent 1e7d499cbf
commit 9cf7117ea0
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/me/ryanhamshire/GriefPrevention/CleanupUnusedClaimsTask.java
View File

@ -68,7 +68,7 @@ class CleanupUnusedClaimsTask implements Runnable
boolean cleanupChunks = false; boolean cleanupChunks = false;
//get data for the player, especially last login timestamp //get data for the player, especially last login timestamp
PlayerData playerData = GriefPrevention.instance.dataStore.getPlayerData(claim.ownerID); PlayerData playerData = null;
//determine area of the default chest claim //determine area of the default chest claim
int areaOfDefaultClaim = 0; int areaOfDefaultClaim = 0;
@ -77,16 +77,16 @@ class CleanupUnusedClaimsTask implements Runnable
areaOfDefaultClaim = (int)Math.pow(GriefPrevention.instance.config_claims_automaticClaimsForNewPlayersRadius * 2 + 1, 2); areaOfDefaultClaim = (int)Math.pow(GriefPrevention.instance.config_claims_automaticClaimsForNewPlayersRadius * 2 + 1, 2);
} }
//if he's been gone at least a week, if he has ONLY the new player claim, it will be removed //if this claim is a chest claim and those are set to expire
Calendar sevenDaysAgo = Calendar.getInstance(); if(claim.getArea() <= areaOfDefaultClaim && GriefPrevention.instance.config_claims_chestClaimExpirationDays > 0)
sevenDaysAgo.add(Calendar.DATE, -GriefPrevention.instance.config_claims_chestClaimExpirationDays);
boolean newPlayerClaimsExpired = sevenDaysAgo.getTime().after(playerData.getLastLogin());
//if only one claim, and the player hasn't played in a week
if(newPlayerClaimsExpired && playerData.getClaims().size() == 1)
{ {
//if that's a chest claim and those are set to expire playerData = GriefPrevention.instance.dataStore.getPlayerData(claim.ownerID);
if(claim.getArea() <= areaOfDefaultClaim && GriefPrevention.instance.config_claims_chestClaimExpirationDays > 0)
//if the owner has been gone at least a week, and if he has ONLY the new player claim, it will be removed
Calendar sevenDaysAgo = Calendar.getInstance();
sevenDaysAgo.add(Calendar.DATE, -GriefPrevention.instance.config_claims_chestClaimExpirationDays);
boolean newPlayerClaimsExpired = sevenDaysAgo.getTime().after(playerData.getLastLogin());
if(newPlayerClaimsExpired && playerData.getClaims().size() == 1)
{ {
claim.removeSurfaceFluids(null); claim.removeSurfaceFluids(null);
GriefPrevention.instance.dataStore.deleteClaim(claim); GriefPrevention.instance.dataStore.deleteClaim(claim);
@ -105,7 +105,8 @@ class CleanupUnusedClaimsTask implements Runnable
//if configured to always remove claims after some inactivity period without exceptions... //if configured to always remove claims after some inactivity period without exceptions...
else if(GriefPrevention.instance.config_claims_expirationDays > 0) else if(GriefPrevention.instance.config_claims_expirationDays > 0)
{ {
Calendar earliestPermissibleLastLogin = Calendar.getInstance(); if(playerData == null) playerData = GriefPrevention.instance.dataStore.getPlayerData(claim.ownerID);
Calendar earliestPermissibleLastLogin = Calendar.getInstance();
earliestPermissibleLastLogin.add(Calendar.DATE, -GriefPrevention.instance.config_claims_expirationDays); earliestPermissibleLastLogin.add(Calendar.DATE, -GriefPrevention.instance.config_claims_expirationDays);
if(earliestPermissibleLastLogin.getTime().after(playerData.getLastLogin())) if(earliestPermissibleLastLogin.getTime().after(playerData.getLastLogin()))
@ -157,7 +158,7 @@ class CleanupUnusedClaimsTask implements Runnable
} }
} }
GriefPrevention.instance.dataStore.clearCachedPlayerData(claim.ownerID); if(playerData != null) GriefPrevention.instance.dataStore.clearCachedPlayerData(claim.ownerID);
//since we're potentially loading a lot of chunks to scan parts of the world where there are no players currently playing, be mindful of memory usage //since we're potentially loading a lot of chunks to scan parts of the world where there are no players currently playing, be mindful of memory usage
if(cleanupChunks) if(cleanupChunks)