Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
Remco 2020-09-28 16:47:52 +02:00
commit 4a58b38820

View File

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