Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-29 05:55:27 +01:00
Code Issues Projects Releases Wiki Activity

Delay between chunk cleans

Browse Source
This commit is contained in:
Zrips 2024-06-28 12:39:30 +03:00
parent 0cd22b3794
commit 29f5cb1a81
1 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/com/gamingmesh/jobs/config/ExploitProtectionManager.java
View File

@ -28,7 +28,29 @@ public class ExploitProtectionManager {
private static final String NAMETIME = "Time"; private static final String NAMETIME = "Time";
private static final String NAMEPAID = "Paid"; private static final String NAMEPAID = "Paid";
private HashMap<String, HashMap<String, CMIChunkPersistentDataContainer>> map = new HashMap<>(); private HashMap<String, HashMap<String, chunkData>> map = new HashMap<>();
class chunkData {
private CMIChunkPersistentDataContainer container;
private long lastClean = 0;
chunkData(CMIChunkPersistentDataContainer container) {
this.container = container;
lastClean = System.currentTimeMillis();
}
public long getLastClean() {
return lastClean;
}
public void setLastClean(long lastClean) {
this.lastClean = lastClean;
}
public CMIChunkPersistentDataContainer getContainer() {
return container;
}
}
private CMIChunkPersistentDataContainer getPDC(Block block) { private CMIChunkPersistentDataContainer getPDC(Block block) {
if (block == null) if (block == null)
@ -39,14 +61,21 @@ public class ExploitProtectionManager {
private CMIChunkPersistentDataContainer getPDC(Chunk chunk) { private CMIChunkPersistentDataContainer getPDC(Chunk chunk) {
if (chunk == null) if (chunk == null)
return null; return null;
HashMap<String, CMIChunkPersistentDataContainer> world = map.computeIfAbsent(chunk.getWorld().getName(), x -> new HashMap<>()); chunkData data = getChunkData(chunk);
return world.computeIfAbsent(chunk.getX() + ":" + chunk.getZ(), x -> new CMIChunkPersistentDataContainer(NAMEGENERAL, chunk)); return data == null ? null : data.getContainer();
}
private chunkData getChunkData(Chunk chunk) {
if (chunk == null)
return null;
HashMap<String, chunkData> world = map.computeIfAbsent(chunk.getWorld().getName(), x -> new HashMap<>());
return world.computeIfAbsent(chunk.getX() + ":" + chunk.getZ(), x -> new chunkData(new CMIChunkPersistentDataContainer(NAMEGENERAL, chunk)));
} }
public void removePDC(Chunk chunk) { public void removePDC(Chunk chunk) {
if (!Jobs.getGCManager().useNewBlockProtection) if (!Jobs.getGCManager().useNewBlockProtection)
return; return;
HashMap<String, CMIChunkPersistentDataContainer> world = map.get(chunk.getWorld().getName()); HashMap<String, chunkData> world = map.get(chunk.getWorld().getName());
if (world == null) if (world == null)
return; return;
world.remove(chunk.getX() + ":" + chunk.getZ()); world.remove(chunk.getX() + ":" + chunk.getZ());
@ -309,17 +338,25 @@ public class ExploitProtectionManager {
try { try {
CMIChunkPersistentDataContainer pdc = getPDC(chunk); chunkData pdc = getChunkData(chunk);
Set<NamespacedKey> keys = pdc.getKeys(); if (pdc == null)
return;
// Delay to clean it up once more to prevent rapid updates of same chunk
if (pdc.getLastClean() + (30 * 1000L) > System.currentTimeMillis())
return;
Set<NamespacedKey> keys = pdc.getContainer().getKeys();
for (NamespacedKey one : keys) { for (NamespacedKey one : keys) {
Long time = deconvertLong(pdc.getInt(one.getKey(), NAMETIME)); Long time = deconvertLong(pdc.getContainer().getInt(one.getKey(), NAMETIME));
if (time != null && time < System.currentTimeMillis()) { if (time != null && time < System.currentTimeMillis()) {
pdc.remove(one.getKey()); pdc.getContainer().remove(one.getKey());
} }
} }
pdc.save(); pdc.getContainer().save();
pdc.setLastClean(System.currentTimeMillis());
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();