Merge branch 'dev' into 'dev'

cleaned up wordfilter

See merge request morningstar/Arcturus-Community!300
This commit is contained in:
Harmonic 2020-09-22 15:35:31 -04:00
commit 4c73b37e21

View File

@ -138,29 +138,14 @@ public class WordFilter {
filteredMessage = this.normalise(filteredMessage); filteredMessage = this.normalise(filteredMessage);
} }
TObjectHashIterator iterator = this.words.iterator(); for (WordFilterWord word : this.words) {
if (!StringUtils.containsIgnoreCase(filteredMessage, word.key)) continue;
boolean foundShit = false;
while (iterator.hasNext()) {
WordFilterWord word = (WordFilterWord) iterator.next();
if (StringUtils.containsIgnoreCase(filteredMessage, word.key)) {
if (habbo != null) { if (habbo != null) {
if (Emulator.getPluginManager().fireEvent(new UserTriggerWordFilterEvent(habbo, word)).isCancelled()) if (Emulator.getPluginManager().fireEvent(new UserTriggerWordFilterEvent(habbo, word)).isCancelled())
continue; continue;
} }
filteredMessage = filteredMessage.replace("(?i)" + word.key, word.replacement);
foundShit = true;
if (habbo != null && word.muteTime > 0) { filteredMessage = filteredMessage.replaceAll("(?i)" + Pattern.quote(word.key), word.replacement);
habbo.mute(word.muteTime, false);
}
}
}
if (!foundShit) {
return message;
} }
return filteredMessage; return filteredMessage;