From 4cf033618b85555508123626495ce304d040ed3b Mon Sep 17 00:00:00 2001 From: Zrips Date: Wed, 30 Oct 2019 10:36:35 +0200 Subject: [PATCH] lets not add into cache when loading data --- .../gamingmesh/jobs/config/BlockProtectionManager.java | 9 +++++---- src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java | 2 +- .../jobs/listeners/PistonProtectionListener.java | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java b/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java index 93f0348f..8328d0c5 100644 --- a/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java +++ b/src/main/java/com/gamingmesh/jobs/config/BlockProtectionManager.java @@ -53,12 +53,12 @@ public class BlockProtectionManager { if (cd == null) return; if (cd != -1) - addP(loc, System.currentTimeMillis() + (cd * 1000), paid); + addP(loc, System.currentTimeMillis() + (cd * 1000), paid, true); else - addP(loc, -1L, paid); + addP(loc, -1L, paid, true); } - public BlockProtection addP(Location loc, Long time, boolean paid) { + public BlockProtection addP(Location loc, Long time, boolean paid, boolean cache) { String v = loc.getBlockX() + ":" + loc.getBlockY() + ":" + loc.getBlockZ(); HashMap>> regions = map.get(loc.getWorld()); if (regions == null) @@ -85,7 +85,8 @@ public class BlockProtectionManager { chunks.put(chunk, Bpm); regions.put(region, chunks); map.put(loc.getWorld(), regions); - addToCache(loc, Bp); + if (cache) + addToCache(loc, Bp); return Bp; } diff --git a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java index a35e7755..07ea860d 100644 --- a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java +++ b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java @@ -2258,7 +2258,7 @@ public abstract class JobsDAO { int z = res.getInt(BlockTableFields.z.getCollumn()); long resets = res.getLong(BlockTableFields.resets.getCollumn()); Location loc = new Location(world, x, y, z); - BlockProtection bp = Jobs.getBpManager().addP(loc, resets, true); + BlockProtection bp = Jobs.getBpManager().addP(loc, resets, true, false); bp.setId(id); long t = System.currentTimeMillis(); bp.setRecorded(res.getLong(BlockTableFields.recorded.getCollumn())); diff --git a/src/main/java/com/gamingmesh/jobs/listeners/PistonProtectionListener.java b/src/main/java/com/gamingmesh/jobs/listeners/PistonProtectionListener.java index 30c0d0c7..7d1352a6 100644 --- a/src/main/java/com/gamingmesh/jobs/listeners/PistonProtectionListener.java +++ b/src/main/java/com/gamingmesh/jobs/listeners/PistonProtectionListener.java @@ -37,7 +37,7 @@ public class PistonProtectionListener implements Listener { Long bp = Jobs.getBpManager().getTime(oldLoc); if (bp != null) { - Jobs.getBpManager().addP(newLoc, bp, true); + Jobs.getBpManager().addP(newLoc, bp, true, true); Jobs.getBpManager().remove(oldLoc); } else { Integer cd = Jobs.getBpManager().getBlockDelayTime(one); @@ -72,7 +72,7 @@ public class PistonProtectionListener implements Listener { Location newLoc = oldLoc.clone().add(x, y, z); Long bp = Jobs.getBpManager().getTime(oldLoc); if (bp != null) { - Jobs.getBpManager().addP(newLoc, bp, true); + Jobs.getBpManager().addP(newLoc, bp, true, true); Jobs.getBpManager().remove(oldLoc); } else { Integer cd = Jobs.getBpManager().getBlockDelayTime(one);