Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-09-28 22:57:29 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #332 from cindyker/versions/spigot1.8-5.x

Browse Source 
Fix broken blacklist (NullPointerException).
This commit is contained in:
sk89q 2014-12-05 22:54:54 -08:00
commit 83b1dabcdd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java
View File

@ -20,6 +20,7 @@
package com.sk89q.worldguard.blacklist; package com.sk89q.worldguard.blacklist;
import com.google.common.cache.Cache; import com.google.common.cache.Cache;
import com.google.common.cache.LoadingCache;
import com.sk89q.worldguard.LocalPlayer; import com.sk89q.worldguard.LocalPlayer;
import com.sk89q.worldguard.blacklist.action.Action; import com.sk89q.worldguard.blacklist.action.Action;
import com.sk89q.worldguard.blacklist.action.ActionResult; import com.sk89q.worldguard.blacklist.action.ActionResult;
@ -181,7 +182,7 @@ public boolean check(boolean useAsWhitelist, BlacklistEvent event, boolean force
Cache<String, TrackedEvent> repeatingEventCache = blacklist.getRepeatingEventCache(); Cache<String, TrackedEvent> repeatingEventCache = blacklist.getRepeatingEventCache();
// Check to see whether this event is being repeated // Check to see whether this event is being repeated
TrackedEvent tracked = repeatingEventCache.getIfPresent(eventCacheKey); TrackedEvent tracked = ((LoadingCache<String, TrackedEvent>)repeatingEventCache).getUnchecked(eventCacheKey);
if (tracked.matches(event)) { if (tracked.matches(event)) {
repeating = true; repeating = true;
} else { } else {