From 6dfa078fa75fe234162d177b751a9594542a6860 Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Sun, 8 May 2022 17:45:31 +0200 Subject: [PATCH] Fix NPE --- .../alttd/tasks/AdminClaimExpireTask.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/tasks/AdminClaimExpireTask.java b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/tasks/AdminClaimExpireTask.java index c9107f7..40a0fa6 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/tasks/AdminClaimExpireTask.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/tasks/AdminClaimExpireTask.java @@ -26,13 +26,18 @@ public class AdminClaimExpireTask extends BukkitRunnable public void run() { //Config.expiringClaims.entrySet().removeIf(entry -> System.currentTimeMillis() >= entry.getValue()); - for(Iterator> it = Config.expiringClaims.entrySet().iterator(); it.hasNext(); ) { + for(Iterator> it = Config.expiringClaims.entrySet().iterator(); it.hasNext();) + { Map.Entry entry = it.next(); - if(System.currentTimeMillis() >= entry.getValue()) { + if(System.currentTimeMillis() >= entry.getValue()) + { Claim claim = plugin.dataStore.getClaim(entry.getKey()); - plugin.dataStore.deleteClaim(claim, false, true); - it.remove(); - plugin.getLogger().info("Removed temporary admin claim with id " + entry.getKey()); + if (claim != null) + { + plugin.dataStore.deleteClaim(claim, false, true); + it.remove(); + plugin.getLogger().info("Removed temporary admin claim with id " + entry.getKey()); + } } } }