From 6e42ed0da4a0b47f8ea2145a0612aec49cff5b22 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 4 Oct 2020 18:24:52 -0400 Subject: [PATCH] Fix WordFinder matching anything with empty BannedWords.txt (#1045) --- .../java/me/ryanhamshire/GriefPrevention/WordFinder.java | 2 ++ src/test/java/me/ryanhamshire/GriefPrevention/Tests.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/WordFinder.java b/src/main/java/me/ryanhamshire/GriefPrevention/WordFinder.java index a30b7ec..82caa8c 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/WordFinder.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/WordFinder.java @@ -27,6 +27,8 @@ class WordFinder //trim extraneous leading pipe (|) patternString = patternString.substring(1); } + // No words are defined, match nothing. + else return; this.pattern = Pattern.compile(patternString, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE); } diff --git a/src/test/java/me/ryanhamshire/GriefPrevention/Tests.java b/src/test/java/me/ryanhamshire/GriefPrevention/Tests.java index b431821..b94eda9 100644 --- a/src/test/java/me/ryanhamshire/GriefPrevention/Tests.java +++ b/src/test/java/me/ryanhamshire/GriefPrevention/Tests.java @@ -2,7 +2,6 @@ package me.ryanhamshire.GriefPrevention; import org.junit.jupiter.api.Test; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.UUID; @@ -68,8 +67,10 @@ public class Tests @Test public void testWordFinderEmptyList() { - WordFinder finder = new WordFinder(new ArrayList<>()); + WordFinder finder = new WordFinder(Collections.emptyList()); assertFalse(finder.hasMatch("alpha")); + finder = new WordFinder(Collections.singletonList("")); + assertFalse(finder.hasMatch("beta")); } @Test