Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java | 5 +++--
- src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java | 5 +++--
- 2 files changed, 6 insertions(+), 4 deletions(-)
- diff --git a/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java b/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java
- index 5c1138e..dda1788 100644
- --- a/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java
- +++ b/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java
- @@ -20,6 +20,7 @@
- package com.sk89q.worldguard.blacklist;
- import com.google.common.cache.Cache;
- +import com.google.common.cache.LoadingCache;
- import com.google.common.cache.CacheBuilder;
- import com.google.common.cache.CacheLoader;
- import com.sk89q.worldguard.blacklist.action.Action;
- @@ -49,7 +50,7 @@
- private final BlacklistLoggerHandler blacklistLogger = new BlacklistLoggerHandler();
- private BlacklistEvent lastEvent;
- private boolean useAsWhitelist;
- - private Cache<String, TrackedEvent> repeatingEventCache = CacheBuilder.newBuilder()
- + private LoadingCache<String, TrackedEvent> repeatingEventCache = CacheBuilder.newBuilder()
- .maximumSize(1000)
- .expireAfterAccess(30, TimeUnit.SECONDS)
- .build(new CacheLoader<String, TrackedEvent>() {
- @@ -284,7 +285,7 @@ public void notify(BlacklistEvent event, String comment) {
- */
- public abstract void broadcastNotification(String msg);
- - public Cache<String, TrackedEvent> getRepeatingEventCache() {
- + public LoadingCache<String, TrackedEvent> getRepeatingEventCache() {
- return repeatingEventCache;
- }
- diff --git a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java
- index ab2ebbd..c515401 100644
- --- a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java
- +++ b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java
- @@ -20,6 +20,7 @@
- package com.sk89q.worldguard.blacklist;
- import com.google.common.cache.Cache;
- +import com.google.common.cache.LoadingCache;
- import com.sk89q.worldguard.LocalPlayer;
- import com.sk89q.worldguard.blacklist.action.Action;
- import com.sk89q.worldguard.blacklist.action.ActionResult;
- @@ -178,10 +179,10 @@ public boolean check(boolean useAsWhitelist, BlacklistEvent event, boolean force
- boolean repeating = false;
- String eventCacheKey = event.getCauseName();
- - Cache<String, TrackedEvent> repeatingEventCache = blacklist.getRepeatingEventCache();
- + LoadingCache<String, TrackedEvent> repeatingEventCache = blacklist.getRepeatingEventCache();
- // Check to see whether this event is being repeated
- - TrackedEvent tracked = repeatingEventCache.getIfPresent(eventCacheKey);
- + TrackedEvent tracked = repeatingEventCache.getUnchecked(eventCacheKey);
- if (tracked.matches(event)) {
- repeating = true;
- } else {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement