Advertisement
Guest User

WG NPE fix (Spigot)

a guest
Nov 28th, 2014
154
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.96 KB | None | 0 0
  1. src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java | 5 +++--
  2. src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java | 5 +++--
  3. 2 files changed, 6 insertions(+), 4 deletions(-)
  4.  
  5. diff --git a/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java b/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java
  6. index 5c1138e..dda1788 100644
  7. --- a/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java
  8. +++ b/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java
  9. @@ -20,6 +20,7 @@
  10. package com.sk89q.worldguard.blacklist;
  11.  
  12. import com.google.common.cache.Cache;
  13. +import com.google.common.cache.LoadingCache;
  14. import com.google.common.cache.CacheBuilder;
  15. import com.google.common.cache.CacheLoader;
  16. import com.sk89q.worldguard.blacklist.action.Action;
  17. @@ -49,7 +50,7 @@
  18. private final BlacklistLoggerHandler blacklistLogger = new BlacklistLoggerHandler();
  19. private BlacklistEvent lastEvent;
  20. private boolean useAsWhitelist;
  21. - private Cache<String, TrackedEvent> repeatingEventCache = CacheBuilder.newBuilder()
  22. + private LoadingCache<String, TrackedEvent> repeatingEventCache = CacheBuilder.newBuilder()
  23. .maximumSize(1000)
  24. .expireAfterAccess(30, TimeUnit.SECONDS)
  25. .build(new CacheLoader<String, TrackedEvent>() {
  26. @@ -284,7 +285,7 @@ public void notify(BlacklistEvent event, String comment) {
  27. */
  28. public abstract void broadcastNotification(String msg);
  29.  
  30. - public Cache<String, TrackedEvent> getRepeatingEventCache() {
  31. + public LoadingCache<String, TrackedEvent> getRepeatingEventCache() {
  32. return repeatingEventCache;
  33. }
  34.  
  35. diff --git a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java
  36. index ab2ebbd..c515401 100644
  37. --- a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java
  38. +++ b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java
  39. @@ -20,6 +20,7 @@
  40. package com.sk89q.worldguard.blacklist;
  41.  
  42. import com.google.common.cache.Cache;
  43. +import com.google.common.cache.LoadingCache;
  44. import com.sk89q.worldguard.LocalPlayer;
  45. import com.sk89q.worldguard.blacklist.action.Action;
  46. import com.sk89q.worldguard.blacklist.action.ActionResult;
  47. @@ -178,10 +179,10 @@ public boolean check(boolean useAsWhitelist, BlacklistEvent event, boolean force
  48.  
  49. boolean repeating = false;
  50. String eventCacheKey = event.getCauseName();
  51. - Cache<String, TrackedEvent> repeatingEventCache = blacklist.getRepeatingEventCache();
  52. + LoadingCache<String, TrackedEvent> repeatingEventCache = blacklist.getRepeatingEventCache();
  53.  
  54. // Check to see whether this event is being repeated
  55. - TrackedEvent tracked = repeatingEventCache.getIfPresent(eventCacheKey);
  56. + TrackedEvent tracked = repeatingEventCache.getUnchecked(eventCacheKey);
  57. if (tracked.matches(event)) {
  58. repeating = true;
  59. } else {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement